This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 31117bb17c4e764bb60b8c9c6847a631cc9ecf3c (commit)
via ed258d606b87dacc465dad73b04f1c3e270b627c (commit)
via fb45c37160e4f8d839a2c29bce80cae7563cfd3a (commit)
via 158f7e31dc685859f5a53d88e965382c6361efb1 (commit)
via 08ce3f486e789275104a390d2d34f36a90c5fd2f (commit)
from 75ad8d342119be9e71006c2f352755ad9565963b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31117bb17c4e764bb60b8c9c6847a631cc9ecf3c
commit 31117bb17c4e764bb60b8c9c6847a631cc9ecf3c
Merge: 75ad8d3 ed258d6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 14 09:19:59 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 14 09:19:59 2015 -0400
Merge topic 'fix-buildsystem-property-append'
ed258d60 Tests: Cover set_property for buildsystem directory properties
fb45c371 cmState: Only append non-empty values to buildsystem properties.
158f7e31 cmMakefile: Use appropriate parameter name.
08ce3f48 cmTarget: Only append non-empty values to buildsystem properties.
-----------------------------------------------------------------------
Summary of changes:
Source/cmState.cxx | 9 +++++++--
Source/cmTarget.cxx | 10 +++++-----
.../RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt | 3 ++-
Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake | 1 +
Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt | 2 +-
Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt | 3 ++-
Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake | 1 +
Tests/RunCMake/set_property/Common.cmake | 14 ++++++++++++++
.../RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt | 3 ++-
Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake | 1 +
Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt | 2 +-
Tests/RunCMake/set_property/USER_PROP-stdout.txt | 1 +
Tests/RunCMake/set_property/USER_PROP.cmake | 1 +
13 files changed, 39 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
