[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-410-gb667da5
Stephen Kelly
steveire at gmail.com
Sat Mar 1 16:05:41 EST 2014
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 b667da5d9a0006132e56357931d3288f01b23b1f (commit)
via 7f91eb83a045f72dbecf1e52ed460377cc1407fa (commit)
via adb89ea3fddbeeb84348e7153190ae4994f6f2ca (commit)
from 9cc4ce2d211a55e2632ed994e82d6739f47436ea (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=b667da5d9a0006132e56357931d3288f01b23b1f
commit b667da5d9a0006132e56357931d3288f01b23b1f
Merge: 9cc4ce2 7f91eb8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 1 16:05:40 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 1 16:05:40 2014 -0500
Merge topic 'alt-test-generator' into next
7f91eb83 Tests: Build alt-test-generator tests in a separate binary dir.
adb89ea3 Move the test setup to the general test setup.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f91eb83a045f72dbecf1e52ed460377cc1407fa
commit 7f91eb83a045f72dbecf1e52ed460377cc1407fa
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 16:59:56 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 1 22:05:03 2014 +0100
Tests: Build alt-test-generator tests in a separate binary dir.
This way, a single CMake build tree can be used to run the
unit tests with multiple generators.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ba8433..42b19da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,7 +159,7 @@ macro(CMAKE_SETUP_TESTING)
"${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
@ONLY)
configure_file(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
- ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
+ ${CMake_BINARY_DIR}/${CMake_TestDir}/.NoDartCoverage)
configure_file(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
@@ -518,6 +518,25 @@ include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
CMAKE_SETUP_TESTING()
+if (CMAKE_TEST_DIFFERENT_GENERATOR)
+ set(CMake_TestAlternative "${CMAKE_TEST_GENERATOR}")
+ if (CMAKE_TEST_GENERATOR_TOOLSET)
+ set(CMake_TestAlternative "${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET}")
+ endif()
+ if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
+ string(MAKE_C_IDENTIFIER "${CMake_TestAlternative}" CMake_TestAlternative)
+ endif()
+ set(CMake_TestAlternative "${CMake_TestAlternative}/")
+
+ # For CMakeTests/IncludeTest.cmake
+ configure_file(CTestCustom.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${CMake_TestAlternative}/CTestCustom.cmake
+ COPYONLY
+ )
+
+endif()
+set(CMake_TestDir "${CMake_TestAlternative}Tests")
+
if(BUILD_TESTING)
include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
endif()
@@ -558,10 +577,10 @@ endif()
# build the remaining subdirectories
add_subdirectory(Source)
add_subdirectory(Utilities)
-add_subdirectory(Tests)
+add_subdirectory(Tests ${CMake_TestDir})
if(BUILD_TESTING)
- CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
+ CMAKE_SET_TARGET_FOLDER(CMakeLibTests "${CMake_TestDir}")
endif()
CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
if(TARGET documentation)
diff --git a/Tests/CMakeInstall.cmake b/Tests/CMakeInstall.cmake
index fda8c54..3c2135c 100644
--- a/Tests/CMakeInstall.cmake
+++ b/Tests/CMakeInstall.cmake
@@ -11,7 +11,7 @@ if(CMake_TEST_INSTALL)
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
# Install to a test directory.
- set(CMake_TEST_INSTALL_PREFIX ${CMake_BINARY_DIR}/Tests/CMakeInstall)
+ set(CMake_TEST_INSTALL_PREFIX ${CMake_BINARY_DIR}/${CMake_TestDir}/CMakeInstall)
set(CMAKE_INSTALL_PREFIX "${CMake_TEST_INSTALL_PREFIX}")
if(CMAKE_CONFIGURATION_TYPES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adb89ea3fddbeeb84348e7153190ae4994f6f2ca
commit adb89ea3fddbeeb84348e7153190ae4994f6f2ca
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 1 09:16:10 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 1 09:37:55 2014 +0100
Move the test setup to the general test setup.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 761ad20..2ba8433 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -413,10 +413,6 @@ include(Source/CMakeVersionCompute.cmake)
enable_testing()
include (${CMAKE_ROOT}/Modules/Dart.cmake)
-# Set up test-time configuration.
-set_directory_properties(PROPERTIES
- TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake")
-
# where to write the resulting executables and libraries
set(BUILD_SHARED_LIBS OFF)
set(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.")
@@ -430,10 +426,6 @@ set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.")
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
-if(BUILD_TESTING)
- include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
-endif()
-
# include special compile flags for some compilers
include(CompileFlags.cmake)
@@ -525,6 +517,15 @@ include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
CMAKE_SETUP_TESTING()
+
+if(BUILD_TESTING)
+ include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
+endif()
+
+# Set up test-time configuration.
+set_directory_properties(PROPERTIES
+ TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/${CMake_TestDir}/EnforceConfig.cmake")
+
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in"
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 42 +++++++++++++++++++++++++++++++-----------
Tests/CMakeInstall.cmake | 2 +-
2 files changed, 32 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list