[Cmake-commits] CMake branch, next, updated. v2.8.7-2365-g5dc2df5
Rolf Eike Beer
eike at sf-mail.de
Mon Jan 30 13:43:20 EST 2012
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 5dc2df56fad1f35cf3721f633edea112f1d0c099 (commit)
via 8de3b3d13ed40e97b74eeac4ce2d966a73c5168a (commit)
from 9b6c0a984b39e6b4bc7f052a6e7d355ebf743390 (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=5dc2df56fad1f35cf3721f633edea112f1d0c099
commit 5dc2df56fad1f35cf3721f633edea112f1d0c099
Merge: 9b6c0a9 8de3b3d
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 30 13:43:11 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 13:43:11 2012 -0500
Merge topic 'check_cxx_compiler_flag_cmakeonly' into next
8de3b3d CheckCXXCompilerFlag test: make it a CMakeOnly test
diff --cc Tests/CMakeOnly/CMakeLists.txt
index 96b9972,2209b20..33c426a
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@@ -15,6 -15,6 +15,8 @@@ add_CMakeOnly_test(CheckSymbolExists
add_CMakeOnly_test(CheckCXXSymbolExists)
+ add_CMakeOnly_test(CheckCXXCompilerFlag)
+
add_CMakeOnly_test(AllFindModules)
+
+add_CMakeOnly_test(TargetScope)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8de3b3d13ed40e97b74eeac4ce2d966a73c5168a
commit 8de3b3d13ed40e97b74eeac4ce2d966a73c5168a
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 17 23:53:26 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 30 19:42:51 2012 +0100
CheckCXXCompilerFlag test: make it a CMakeOnly test
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index badc76b..2c5acd9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -241,8 +241,6 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
- ADD_TEST_MACRO(Module.CheckCXXCompilerFlag CheckCXXCompilerFlag)
-
ADD_TEST(LinkFlags-prepare
${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
--build-and-test
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 20e6a3a..2209b20 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -15,4 +15,6 @@ add_CMakeOnly_test(CheckSymbolExists)
add_CMakeOnly_test(CheckCXXSymbolExists)
+add_CMakeOnly_test(CheckCXXCompilerFlag)
+
add_CMakeOnly_test(AllFindModules)
diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
similarity index 86%
rename from Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
rename to Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
index 77f5006..e205330 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
@@ -56,19 +56,3 @@ if(CMAKE_COMPILER_IS_GNUCXX)
else()
message("Unhandled Platform")
endif()
-
-#
-# This is a no-op executable... If this test is going to fail, it fails during
-# the configure step while cmake is configuring this CMakeLists.txt file...
-#
-
-file(WRITE
- "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
- "int main() { return 0; }
-"
-)
-
-add_executable(
- CheckCXXCompilerFlag
- "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 --
Tests/CMakeOnly/CMakeLists.txt | 2 ++
.../CheckCXXCompilerFlag/CMakeLists.txt | 16 ----------------
3 files changed, 2 insertions(+), 18 deletions(-)
rename Tests/{Module => CMakeOnly}/CheckCXXCompilerFlag/CMakeLists.txt (86%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list