[Cmake-commits] CMake branch, next, updated. v3.3.1-2745-g90915ac
Brad King
brad.king at kitware.com
Wed Sep 2 18:42:23 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 90915aca8716a600313fe900a6a41921ad25f205 (commit)
via 3e47e59c4cbd4d0f5caf977c58564b5b2ea6b7ca (commit)
from 982fffce537f6bb5dbf9c332bbaf065fd6f1f502 (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=90915aca8716a600313fe900a6a41921ad25f205
commit 90915aca8716a600313fe900a6a41921ad25f205
Merge: 982fffc 3e47e59
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 18:42:22 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 18:42:22 2015 -0400
Merge topic 'fix-buildsystem-target-properties' into next
3e47e59c Revert "Tests: Cover set_property for buildsystem target properties"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e47e59c4cbd4d0f5caf977c58564b5b2ea6b7ca
commit 3e47e59c4cbd4d0f5caf977c58564b5b2ea6b7ca
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 18:41:52 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 18:41:52 2015 -0400
Revert "Tests: Cover set_property for buildsystem target properties"
This reverts commit c7c0d1a6057d7b4bcffe94032844cb3b852d51fd.
The test needs to be revised to work on VS generators.
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
deleted file mode 100644
index b85f41d..0000000
--- a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target COMPILE_DEFINITIONS is 'a;;b;c;;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
deleted file mode 100644
index ec07ce9..0000000
--- a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(COMPILE_DEFINITIONS)
diff --git a/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt b/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
deleted file mode 100644
index 81ef170..0000000
--- a/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target COMPILE_FEATURES is 'a;;b;c;;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_FEATURES.cmake b/Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
deleted file mode 100644
index 1ab52ef..0000000
--- a/Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(COMPILE_FEATURES)
diff --git a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
deleted file mode 100644
index f18451a..0000000
--- a/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target COMPILE_OPTIONS is 'a;;b;c;;d;;e'
diff --git a/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake b/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
deleted file mode 100644
index da20ec8..0000000
--- a/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(COMPILE_OPTIONS)
diff --git a/Tests/RunCMake/set_property/Common.cmake b/Tests/RunCMake/set_property/Common.cmake
deleted file mode 100644
index 50e07f8..0000000
--- a/Tests/RunCMake/set_property/Common.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-macro(test_target_property PROP)
- add_custom_target(CustomTarget)
- set_property(TARGET CustomTarget PROPERTY ${PROP} x)
- set_property(TARGET CustomTarget PROPERTY ${PROP})
- set_property(TARGET CustomTarget APPEND PROPERTY ${PROP})
- set_property(TARGET CustomTarget PROPERTY ${PROP} a)
- set_property(TARGET CustomTarget APPEND PROPERTY ${PROP} "")
- set_property(TARGET CustomTarget APPEND PROPERTY ${PROP} b c)
- set_property(TARGET CustomTarget APPEND PROPERTY ${PROP})
- set_property(TARGET CustomTarget APPEND PROPERTY ${PROP} "d;;e")
- get_property(val TARGET CustomTarget PROPERTY ${PROP})
- message(STATUS "Target ${PROP} is '${val}'")
-endmacro()
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
deleted file mode 100644
index f9970ce..0000000
--- a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target INCLUDE_DIRECTORIES is 'a;;b;c;;d;;e'
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
deleted file mode 100644
index 8f44aee..0000000
--- a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(INCLUDE_DIRECTORIES)
diff --git a/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt b/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
deleted file mode 100644
index 1f7663b..0000000
--- a/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target LINK_LIBRARIES is 'a;;b;c;;d;;e'
diff --git a/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake b/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake
index 5155f59..994e874 100644
--- a/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake
+++ b/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake
@@ -1,2 +1,7 @@
-include(Common.cmake)
-test_target_property(LINK_LIBRARIES)
+add_custom_target(CustomTarget)
+set_property(TARGET CustomTarget PROPERTY LINK_LIBRARIES)
+set_property(TARGET CustomTarget APPEND PROPERTY LINK_LIBRARIES)
+get_property(val TARGET CustomTarget PROPERTY LINK_LIBRARIES)
+if (NOT "${val}" STREQUAL "")
+ message(FATAL_ERROR "LINK_LIBRARIES value is '${val}' but should be ''")
+endif()
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 37c7124..54e63f7 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -1,9 +1,3 @@
include(RunCMake)
-run_cmake(COMPILE_DEFINITIONS)
-run_cmake(COMPILE_FEATURES)
-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/SOURCES-stdout.txt b/Tests/RunCMake/set_property/SOURCES-stdout.txt
deleted file mode 100644
index 921d5b1..0000000
--- a/Tests/RunCMake/set_property/SOURCES-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- Target SOURCES is 'a;b;c;d;e'
diff --git a/Tests/RunCMake/set_property/SOURCES.cmake b/Tests/RunCMake/set_property/SOURCES.cmake
deleted file mode 100644
index 820641e..0000000
--- a/Tests/RunCMake/set_property/SOURCES.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(SOURCES)
diff --git a/Tests/RunCMake/set_property/USER_PROP-stdout.txt b/Tests/RunCMake/set_property/USER_PROP-stdout.txt
deleted file mode 100644
index eaf6e37..0000000
--- a/Tests/RunCMake/set_property/USER_PROP-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
--- 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
deleted file mode 100644
index e1f88e1..0000000
--- a/Tests/RunCMake/set_property/USER_PROP.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Common.cmake)
-test_target_property(USER_PROP)
diff --git a/Tests/RunCMake/set_property/a b/Tests/RunCMake/set_property/a
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/set_property/b b/Tests/RunCMake/set_property/b
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/set_property/c b/Tests/RunCMake/set_property/c
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/set_property/d b/Tests/RunCMake/set_property/d
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/set_property/e b/Tests/RunCMake/set_property/e
deleted file mode 100644
index e69de29..0000000
-----------------------------------------------------------------------
Summary of changes:
.../RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt | 1 -
Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake | 2 --
Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt | 1 -
Tests/RunCMake/set_property/COMPILE_FEATURES.cmake | 2 --
Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt | 1 -
Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake | 2 --
Tests/RunCMake/set_property/Common.cmake | 13 -------------
.../RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt | 1 -
Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake | 2 --
Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt | 1 -
Tests/RunCMake/set_property/LINK_LIBRARIES.cmake | 9 +++++++--
Tests/RunCMake/set_property/RunCMakeTest.cmake | 6 ------
Tests/RunCMake/set_property/SOURCES-stdout.txt | 1 -
Tests/RunCMake/set_property/SOURCES.cmake | 2 --
Tests/RunCMake/set_property/USER_PROP-stdout.txt | 1 -
Tests/RunCMake/set_property/USER_PROP.cmake | 2 --
16 files changed, 7 insertions(+), 40 deletions(-)
delete mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
delete mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
delete mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
delete mode 100644 Tests/RunCMake/set_property/Common.cmake
delete mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
delete mode 100644 Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/SOURCES-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/SOURCES.cmake
delete mode 100644 Tests/RunCMake/set_property/USER_PROP-stdout.txt
delete mode 100644 Tests/RunCMake/set_property/USER_PROP.cmake
delete mode 100644 Tests/RunCMake/set_property/a
delete mode 100644 Tests/RunCMake/set_property/b
delete mode 100644 Tests/RunCMake/set_property/c
delete mode 100644 Tests/RunCMake/set_property/d
delete mode 100644 Tests/RunCMake/set_property/e
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list