[Cmake-commits] CMake branch, next, updated. v2.8.9-209-g738ff50

[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  738ff50f686d11ce7a9d8fa1e2420545da36184b (commit)
       via  ca7fb14f9b966805cb11fdf71648337b71c1047b (commit)
       via  733deb66c63dbbd8caa84f7630318c6f76da2d9f (commit)
      from  c14e5d7e54bb5310a09c8d3da63d955c5dc9764c (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=738ff50f686d11ce7a9d8fa1e2420545da36184b
commit 738ff50f686d11ce7a9d8fa1e2420545da36184b
Merge: c14e5d7 ca7fb14
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 21 05:07:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 21 05:07:01 2012 -0400

    Merge topic 'compile-definitions-unique' into next
    
    ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property
    733deb6 Fix CompileDefinitions test on Visual Studio.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca7fb14f9b966805cb11fdf71648337b71c1047b
commit ca7fb14f9b966805cb11fdf71648337b71c1047b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 21 11:05:07 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 21 11:05:07 2012 +0200

    Fix the test setting COMPILE_DEFINITIONS target property

diff --git a/Tests/CompileDefinitions/target_prop/CMakeLists.txt b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
index 8248a21..6dbee9a 100644
--- a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
@@ -3,7 +3,7 @@ project(target_prop)
 
 add_executable(target_prop_executable ../main.cpp)
 
-set_target_properties(target_prop_executable PROPERTIES CMAKE_IS_FUN -DCMAKE_IS_REALLY="Very Fun")
+set_target_properties(target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_FUN)
 
 set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun" CMAKE_IS=Fun)
 set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_FUN CMAKE_IS_="Fun")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=733deb66c63dbbd8caa84f7630318c6f76da2d9f
commit 733deb66c63dbbd8caa84f7630318c6f76da2d9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 21 11:04:09 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 21 11:04:09 2012 +0200

    Fix CompileDefinitions test on Visual Studio.
    
    Avoid testing unsupported spaces in define values.

diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 3e4181b..337aeb1 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(CompileDefinitions)
 
+if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6")
+    add_definitions(-DNO_SPACES_IN_DEFINE_VALUES)
+endif()
+
 add_subdirectory(add_definitions_command)
 add_subdirectory(target_prop)
 add_subdirectory(add_definitions_command_with_target_prop)
diff --git a/Tests/CompileDefinitions/main.cpp b/Tests/CompileDefinitions/main.cpp
index d80c9dc..6db6f3f 100644
--- a/Tests/CompileDefinitions/main.cpp
+++ b/Tests/CompileDefinitions/main.cpp
@@ -15,11 +15,16 @@ template<>
 struct CMakeStaticAssert<true> {};
 
 static const char fun_string[] = CMAKE_IS_;
+#ifndef NO_SPACES_IN_DEFINE_VALUES
 static const char very_fun_string[] = CMAKE_IS_REALLY;
+#endif
 
 enum {
-  StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>),
+  StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>)
+#ifndef NO_SPACES_IN_DEFINE_VALUES
+  ,
   StringLiteralTest2 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_REALLY) == sizeof("Very Fun")>)
+#endif
 };
 
 int main(int argc, char **argv)

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

Summary of changes:
 Tests/CompileDefinitions/CMakeLists.txt            |    4 ++++
 Tests/CompileDefinitions/main.cpp                  |    7 ++++++-
 .../CompileDefinitions/target_prop/CMakeLists.txt  |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake