[Cmake-commits] CMake branch, next, updated. v3.1.1-2308-g82e1359
Brad King
brad.king at kitware.com
Sun Jan 25 08:12:46 EST 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 82e135908ad68429d857e6439b9e10398b2668d7 (commit)
via 494f6e8d5b9f2e556a2b2db2c165a56c01fd1827 (commit)
from 5b5d8daf1082dbc0c4c9cdb6097dd6663aea81fb (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=82e135908ad68429d857e6439b9e10398b2668d7
commit 82e135908ad68429d857e6439b9e10398b2668d7
Merge: 5b5d8da 494f6e8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 08:12:45 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 25 08:12:45 2015 -0500
Merge topic 'shorten-test-paths' into next
494f6e8d Tests: Shorten paths in CompileDefinitions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=494f6e8d5b9f2e556a2b2db2c165a56c01fd1827
commit 494f6e8d5b9f2e556a2b2db2c165a56c01fd1827
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 25 08:09:10 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 25 08:12:12 2015 -0500
Tests: Shorten paths in CompileDefinitions
Shorten the add_definitions command test directory and target names to
avoid creating really long paths that fail with some tools on Windows.
While at it, remove unnecessary project() command calls.
diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 930d220..13d1b01 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -1,6 +1,4 @@
-
cmake_minimum_required(VERSION 2.8)
-
project(CompileDefinitions)
if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6")
@@ -19,8 +17,8 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
"BUILD_CONFIG_NAME=\"$<CONFIGURATION>\""
)
-add_subdirectory(add_definitions_command)
+add_subdirectory(add_def_cmd)
add_subdirectory(target_prop)
-add_subdirectory(add_definitions_command_with_target_prop)
+add_subdirectory(add_def_cmd_tprop)
add_executable(CompileDefinitions runtest.c)
diff --git a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt b/Tests/CompileDefinitions/add_def_cmd/CMakeLists.txt
similarity index 80%
rename from Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
rename to Tests/CompileDefinitions/add_def_cmd/CMakeLists.txt
index 23e0134..2bce602 100644
--- a/Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
+++ b/Tests/CompileDefinitions/add_def_cmd/CMakeLists.txt
@@ -1,6 +1,3 @@
-
-project(add_definitions_command)
-
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")
@@ -12,4 +9,4 @@ 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)
+add_executable(add_def_cmd_exe ../compiletest.cpp)
diff --git a/Tests/CompileDefinitions/add_def_cmd_tprop/CMakeLists.txt b/Tests/CompileDefinitions/add_def_cmd_tprop/CMakeLists.txt
new file mode 100644
index 0000000..4ef8a09
--- /dev/null
+++ b/Tests/CompileDefinitions/add_def_cmd_tprop/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
+
+add_executable(add_def_cmd_tprop_exe ../compiletest.cpp)
+
+set_target_properties(add_def_cmd_tprop_exe PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_="Fun")
+
+if (NOT NO_SPACES_IN_DEFINE_VALUES)
+ set_property(TARGET add_def_cmd_tprop_exe APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS_REALLY="Very Fun")
+endif()
+
+add_definitions(-DCMAKE_IS_FUN)
+
+set_property(TARGET add_def_cmd_tprop_exe APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS=Fun CMAKE_IS_="Fun")
+
+add_definitions(-DBUILD_IS_DEBUG=$<CONFIG:Debug>)
+set_property(TARGET add_def_cmd_tprop_exe APPEND PROPERTY COMPILE_DEFINITIONS BUILD_IS_NOT_DEBUG=$<NOT:$<CONFIG:Debug>>)
diff --git a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt b/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
deleted file mode 100644
index 55108db..0000000
--- a/Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-project(add_definitions_command_with_target_prop)
-
-add_definitions(-DCMAKE_IS_FUN -DCMAKE_IS=Fun)
-
-add_executable(add_definitions_command_with_target_prop_executable ../compiletest.cpp)
-
-set_target_properties(add_definitions_command_with_target_prop_executable PROPERTIES COMPILE_DEFINITIONS CMAKE_IS_="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)
-
-set_property(TARGET add_definitions_command_with_target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_IS=Fun CMAKE_IS_="Fun")
-
-add_definitions(-DBUILD_IS_DEBUG=$<CONFIG:Debug>)
-set_property(TARGET add_definitions_command_with_target_prop_executable APPEND PROPERTY COMPILE_DEFINITIONS BUILD_IS_NOT_DEBUG=$<NOT:$<CONFIG:Debug>>)
-----------------------------------------------------------------------
Summary of changes:
Tests/CompileDefinitions/CMakeLists.txt | 6 ++----
.../CMakeLists.txt | 5 +----
.../add_def_cmd_tprop/CMakeLists.txt | 16 ++++++++++++++++
.../CMakeLists.txt | 19 -------------------
4 files changed, 19 insertions(+), 27 deletions(-)
rename Tests/CompileDefinitions/{add_definitions_command => add_def_cmd}/CMakeLists.txt (80%)
create mode 100644 Tests/CompileDefinitions/add_def_cmd_tprop/CMakeLists.txt
delete mode 100644 Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list