[Cmake-commits] CMake branch, next, updated. v3.3.1-2747-g8c9e49a
Brad King
brad.king at kitware.com
Wed Sep 2 19:02:35 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 8c9e49abb1e345dbf794adc5f328180c471804dd (commit)
via f2f84a2425f8fc2623facd3cac3798d4a7be2d45 (commit)
from 90915aca8716a600313fe900a6a41921ad25f205 (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=8c9e49abb1e345dbf794adc5f328180c471804dd
commit 8c9e49abb1e345dbf794adc5f328180c471804dd
Merge: 90915ac f2f84a2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 19:02:32 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 19:02:32 2015 -0400
Merge topic 'fix-buildsystem-target-properties' into next
f2f84a24 Tests: Cover set_property for buildsystem target properties
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2f84a2425f8fc2623facd3cac3798d4a7be2d45
commit f2f84a2425f8fc2623facd3cac3798d4a7be2d45
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 15:57:41 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 18:57:21 2015 -0400
Tests: Cover set_property for buildsystem target properties
Extend the RunCMake.set_property test with cases covering buildsystem
target properties:
* COMPILE_DEFINITIONS
* COMPILE_FEATURES
* COMPILE_OPTIONS
* INCLUDE_DIRECTORIES
* LINK_LIBRARIES
* SOURCES
Also test a non-buildsystem property to document the current difference
in behavior. Refactor the existing LINK_LIBRARIES case to the same
more-extensive test as the rest. Use the output generated by CMake 3.3
as the expected output for each test case.
diff --git a/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
new file mode 100644
index 0000000..b85f41d
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
@@ -0,0 +1 @@
+-- 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
new file mode 100644
index 0000000..ec07ce9
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..81ef170
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
@@ -0,0 +1 @@
+-- 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
new file mode 100644
index 0000000..1ab52ef
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..f18451a
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
@@ -0,0 +1 @@
+-- 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
new file mode 100644
index 0000000..da20ec8
--- /dev/null
+++ b/Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
@@ -0,0 +1,2 @@
+include(Common.cmake)
+test_target_property(COMPILE_OPTIONS)
diff --git a/Tests/RunCMake/set_property/Common.cmake b/Tests/RunCMake/set_property/Common.cmake
new file mode 100644
index 0000000..b359487
--- /dev/null
+++ b/Tests/RunCMake/set_property/Common.cmake
@@ -0,0 +1,14 @@
+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}'")
+ set_property(TARGET CustomTarget PROPERTY ${PROP})
+endmacro()
diff --git a/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
new file mode 100644
index 0000000..f9970ce
--- /dev/null
+++ b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
@@ -0,0 +1 @@
+-- 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
new file mode 100644
index 0000000..8f44aee
--- /dev/null
+++ b/Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..1f7663b
--- /dev/null
+++ b/Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
@@ -0,0 +1 @@
+-- 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 994e874..5155f59 100644
--- a/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake
+++ b/Tests/RunCMake/set_property/LINK_LIBRARIES.cmake
@@ -1,7 +1,2 @@
-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()
+include(Common.cmake)
+test_target_property(LINK_LIBRARIES)
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index 54e63f7..37c7124 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -1,3 +1,9 @@
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
new file mode 100644
index 0000000..921d5b1
--- /dev/null
+++ b/Tests/RunCMake/set_property/SOURCES-stdout.txt
@@ -0,0 +1 @@
+-- Target SOURCES is 'a;b;c;d;e'
diff --git a/Tests/RunCMake/set_property/SOURCES.cmake b/Tests/RunCMake/set_property/SOURCES.cmake
new file mode 100644
index 0000000..820641e
--- /dev/null
+++ b/Tests/RunCMake/set_property/SOURCES.cmake
@@ -0,0 +1,2 @@
+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
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:
.../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 | 14 ++++++++++++++
.../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, 41 insertions(+), 7 deletions(-)
create mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS-stdout.txt
create mode 100644 Tests/RunCMake/set_property/COMPILE_DEFINITIONS.cmake
create mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES-stdout.txt
create mode 100644 Tests/RunCMake/set_property/COMPILE_FEATURES.cmake
create mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS-stdout.txt
create mode 100644 Tests/RunCMake/set_property/COMPILE_OPTIONS.cmake
create mode 100644 Tests/RunCMake/set_property/Common.cmake
create mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES-stdout.txt
create mode 100644 Tests/RunCMake/set_property/INCLUDE_DIRECTORIES.cmake
create mode 100644 Tests/RunCMake/set_property/LINK_LIBRARIES-stdout.txt
create mode 100644 Tests/RunCMake/set_property/SOURCES-stdout.txt
create mode 100644 Tests/RunCMake/set_property/SOURCES.cmake
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