[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3152-g250dd77

[Stephen Kelly]

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  250dd777fb6b240ab9377c11643483d266d1b88e (commit)
       via  5f991f1a4619e11a5afa195d6b61cdec81967fba (commit)
      from  9cd5e74a6064bab92d0e8315feda17b85a15eb56 (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=250dd777fb6b240ab9377c11643483d266d1b88e
commit 250dd777fb6b240ab9377c11643483d266d1b88e
Merge: 9cd5e74 5f991f1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 16 09:26:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 16 09:26:15 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    5f991f1 Add a roundtrip test of a definition with a semicolon.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f991f1a4619e11a5afa195d6b61cdec81967fba
commit 5f991f1a4619e11a5afa195d6b61cdec81967fba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 16 15:24:54 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 16 15:24:54 2013 +0200

    Add a roundtrip test of a definition with a semicolon.

diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 3e1d4e7..12bb835 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -46,6 +46,20 @@ target_compile_definitions(CompileDefinitions PRIVATE
 )
 add_definitions("-DSEMICOLON_STRING3=\"foo${SEMICOLON}bar\"")
 
+add_library(emptyTarget empty.cpp)
+set_property(
+  TARGET emptyTarget
+  APPEND PROPERTY COMPILE_DEFINITIONS
+  "SEMICOLON_STRING4=\"foo${SEMICOLON}bar\""
+  )
+
+get_target_property(_roundtrip emptyTarget COMPILE_DEFINITIONS)
+set_property(
+  TARGET CompileDefinitions
+  APPEND PROPERTY COMPILE_DEFINITIONS
+  "${_roundtrip}"
+  )
+
 if (SEMICOLON)
   set_property(
     TARGET CompileDefinitions
diff --git a/Tests/CompileDefinitions/runtest.c b/Tests/CompileDefinitions/runtest.c
index 66279f2..9a236e9 100644
--- a/Tests/CompileDefinitions/runtest.c
+++ b/Tests/CompileDefinitions/runtest.c
@@ -46,7 +46,8 @@ int main()
 #ifdef TEST_SEMICOLON
   if(strcmp(SEMICOLON_STRING1, "foo;bar") != 0
       || strcmp(SEMICOLON_STRING2, "foo;bar") != 0
-      || strcmp(SEMICOLON_STRING3, "foo;bar") != 0)
+      || strcmp(SEMICOLON_STRING3, "foo;bar") != 0
+      || strcmp(SEMICOLON_STRING4, "foo;bar") != 0)
     {
     fprintf(stderr, "SEMICOLON_STRING is not \"foo;bar\"\n");
     return 1;

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

Summary of changes:
 Tests/CompileDefinitions/CMakeLists.txt |   14 ++++++++++++++
 Tests/CompileDefinitions/runtest.c      |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake