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 07473a69c38a87f5d365d6a28125a37a954df8f7 (commit)
via 015309fc9f87babaadc2510eb80298b1f2389e8c (commit)
from c36e02752875791e7e5fe534bd1753a37c8cfd97 (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=07473a69c38a87f5d365d6a28125a37a954df8f7
commit 07473a69c38a87f5d365d6a28125a37a954df8f7
Merge: c36e027 015309f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 24 09:39:15 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri May 24 09:39:15 2013 -0400
Merge topic 'silence-vs6-warnings' into next
015309f Tests/CompileDefinitions: Avoid spaces in defines on VS 6
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=015309fc9f87babaadc2510eb80298b1f2389e8c
commit 015309fc9f87babaadc2510eb80298b1f2389e8c
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed May 22 10:25:27 2013 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 24 09:35:43 2013 -0400
Tests/CompileDefinitions: Avoid spaces in defines on VS 6
The VS 6 IDE does not like spaces in definition values so CMake drops
them and warns. The Tests/CompileDefinitions test C code that looks for
the dropped definitions already knows to skip them, but CMake still
warns. Silence the warnings by avoiding such values in the first place
on VS 6.
diff --git a/Tests/CompileDefinitions/CMakeLists.txt
b/Tests/CompileDefinitions/CMakeLists.txt
index d3e9a3e..930d220 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -5,6 +5,7 @@ project(CompileDefinitions)
if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6")
add_definitions(-DNO_SPACES_IN_DEFINE_VALUES)
+ set(NO_SPACES_IN_DEFINE_VALUES 1)
endif()
# Use compile flags to tell executables which config is built
diff --git a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
index d3886a1..23e0134 100644
--- a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
+++ b/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
@@ -1,8 +1,15 @@
project(add_definitions_command)
-add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_="Fun"
-DCMAKE_IS_REALLY="Very Fun")
-add_definitions(-DCMAKE_IS_="Fun" -DCMAKE_IS_REALLY="Very Fun" -DCMAKE_IS_FUN
-DCMAKE_IS=Fun)
+add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun -DCMAKE_IS_="Fun")
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+ add_definitions(-DCMAKE_IS_REALLY="Very Fun")
+endif()
+add_definitions(-DCMAKE_IS_="Fun")
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+ add_definitions(-DCMAKE_IS_REALLY="Very Fun")
+endif()
+add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
add_definitions(-DBUILD_IS_DEBUG=$<CONFIG:Debug>
-DBUILD_IS_NOT_DEBUG=$<NOT:$<CONFIG:Debug>>)
add_executable(add_definitions_command_executable ../compiletest.cpp)
diff --git
a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
index 5587f7f..55108db 100644
---
a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
+++
b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
@@ -7,7 +7,9 @@
add_executable(add_definitions_command_with_target_prop_executable ../compiletes
set_target_properties(add_definitions_command_with_target_prop_executable
PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_="Fun")
-set_property(TARGET add_definitions_command_with_target_prop_executable APPEND
PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun")
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+ set_property(TARGET add_definitions_command_with_target_prop_executable
APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun")
+endif()
add_definitions(-DCMAKE_IS_FUN)
diff --git a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
index 66a3aa6..6bf9c5c 100644
--- a/Tests/CompileDefinitions/target_prop/CMakeLists.txt
+++ b/Tests/CompileDefinitions/target_prop/CMakeLists.txt
@@ -5,7 +5,11 @@ add_executable(target_prop_executable ../compiletest.cpp)
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)
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+ set_property(TARGET target_prop_executable APPEND PROPERTY
COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun" CMAKE_IS=Fun)
+else()
+ set_property(TARGET target_prop_executable APPEND PROPERTY
COMPILE_DEFINITIONS CMAKE_IS=Fun)
+endif()
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS
CMAKE_IS_FUN CMAKE_IS_="Fun")
set_property(TARGET target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileDefinitions/CMakeLists.txt | 1 +
.../add_definitions_command/CMakeLists.txt | 11 +++++++++--
.../CMakeLists.txt | 4 +++-
.../CompileDefinitions/target_prop/CMakeLists.txt | 6 +++++-
4 files changed, 18 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
