[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3351-gf8d8b6f

Brad King brad.king at kitware.com
Wed Jul 24 13:30:18 EDT 2013


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  f8d8b6fc345d38bad76f52d87469cbfebeda3011 (commit)
       via  a43e5e0ad56883366ecd7fd01c31e9ed5fcf5ae1 (commit)
      from  72b4cb63d8ca5a80daabdace7f41a3ed82257406 (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=f8d8b6fc345d38bad76f52d87469cbfebeda3011
commit f8d8b6fc345d38bad76f52d87469cbfebeda3011
Merge: 72b4cb6 a43e5e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 13:30:04 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 13:30:04 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    a43e5e0 Test COMPILE_DEFINITIONS target property get/set/get round-trip


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a43e5e0ad56883366ecd7fd01c31e9ed5fcf5ae1
commit a43e5e0ad56883366ecd7fd01c31e9ed5fcf5ae1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 13:25:11 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 24 13:25:47 2013 -0400

    Test COMPILE_DEFINITIONS target property get/set/get round-trip
    
    Teach the Preprocess test to get, set, and then get the same value for
    the COMPILE_DEFINITIONS target property and verify that the value is not
    changed.  This ensures the internal structured storage of the property
    value can reproduce the original string value.

diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt
index bc92a94..d44cb9c 100644
--- a/Tests/Preprocess/CMakeLists.txt
+++ b/Tests/Preprocess/CMakeLists.txt
@@ -259,6 +259,19 @@ set_property(
   ${DEF_FILE_PATH}
   )
 
+# Try reading and writing the property value to ensure the string is
+# preserved.
+get_property(defs1 TARGET Preprocess PROPERTY COMPILE_DEFINITIONS)
+set_property(TARGET Preprocess PROPERTY COMPILE_DEFINITIONS "${defs1}")
+get_property(defs2 TARGET Preprocess PROPERTY COMPILE_DEFINITIONS)
+if(NOT "x${defs1}" STREQUAL "x${defs2}")
+  message(FATAL_ERROR "get/set/get COMPILE_DEFINITIONS round trip failed.  "
+    "First get:\n"
+    "  ${defs1}\n"
+    "Second get:\n"
+    "  ${defs2}")
+endif()
+
 # Helper target for running test manually in build tree.
 add_custom_target(drive COMMAND Preprocess)
 

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

Summary of changes:
 Tests/Preprocess/CMakeLists.txt |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list