[Cmake-commits] CMake branch, next, updated. v3.3.1-2741-ge4888da

Brad King brad.king at kitware.com
Wed Sep 2 17:00:33 EDT 2015


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, next has been updated
       via  e4888da8ab906ac2f4e3f8dfca98db351e5855d0 (commit)
       via  08fe7b5f1ed86b9a635967ef1c0b8adc83495a1b (commit)
      from  15f0d580d295ecb663147529f5880d95bc8764c8 (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=e4888da8ab906ac2f4e3f8dfca98db351e5855d0
commit e4888da8ab906ac2f4e3f8dfca98db351e5855d0
Merge: 15f0d58 08fe7b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 17:00:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 17:00:31 2015 -0400

    Merge topic 'fix-buildsystem-target-properties' into next
    
    08fe7b5f fixup! Tests: Cover set_property for buildsystem target properties


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08fe7b5f1ed86b9a635967ef1c0b8adc83495a1b
commit 08fe7b5f1ed86b9a635967ef1c0b8adc83495a1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 16:58:54 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 17:00:10 2015 -0400

    fixup! Tests: Cover set_property for buildsystem target properties
    
    Also test a non-buildsystem property to record how the behavior
    currently differs.

diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index f38564c..37c7124 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -6,3 +6,4 @@ run_cmake(COMPILE_OPTIONS)
 run_cmake(INCLUDE_DIRECTORIES)
 run_cmake(LINK_LIBRARIES)
 run_cmake(SOURCES)
+run_cmake(USER_PROP)
diff --git a/Tests/RunCMake/set_property/USER_PROP-stdout.txt b/Tests/RunCMake/set_property/USER_PROP-stdout.txt
new file mode 100644
index 0000000..eaf6e37
--- /dev/null
+++ b/Tests/RunCMake/set_property/USER_PROP-stdout.txt
@@ -0,0 +1 @@
+-- Target USER_PROP is 'a;b;c;d;;e'
diff --git a/Tests/RunCMake/set_property/USER_PROP.cmake b/Tests/RunCMake/set_property/USER_PROP.cmake
new file mode 100644
index 0000000..e1f88e1
--- /dev/null
+++ b/Tests/RunCMake/set_property/USER_PROP.cmake
@@ -0,0 +1,2 @@
+include(Common.cmake)
+test_target_property(USER_PROP)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/set_property/RunCMakeTest.cmake   |    1 +
 Tests/RunCMake/set_property/USER_PROP-stdout.txt |    1 +
 Tests/RunCMake/set_property/USER_PROP.cmake      |    2 ++
 3 files changed, 4 insertions(+)
 create mode 100644 Tests/RunCMake/set_property/USER_PROP-stdout.txt
 create mode 100644 Tests/RunCMake/set_property/USER_PROP.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list