[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-414-g964dfe7

[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  964dfe709213d1c3dbcea6984078f64429a6c855 (commit)
       via  f145e3ba44c8456f27ee9e239128b938636bde64 (commit)
      from  c7fba0c2ac5bdde719cc931896c71b52bdb1bb69 (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=964dfe709213d1c3dbcea6984078f64429a6c855
commit 964dfe709213d1c3dbcea6984078f64429a6c855
Merge: c7fba0c f145e3b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 2 06:03:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 2 06:03:53 2014 -0500

    Merge topic 'alt-test-generator' into next
    
    f145e3ba Tests: Build alt-test-generator tests in a separate binary dir.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f145e3ba44c8456f27ee9e239128b938636bde64
commit f145e3ba44c8456f27ee9e239128b938636bde64
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 16:59:56 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 2 12:03: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.
    
    Move creation of NoDartCoverage file to after populating the
    CMake_TestDir variable.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ba8433..8a36015 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,8 +159,6 @@ macro(CMAKE_SETUP_TESTING)
     "${CMAKE_CURRENT_BINARY_DIR}/CTestScript.cmake"
     @ONLY)
   configure_file(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
-    ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
-  configure_file(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
     ${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
   configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
     ${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
@@ -518,6 +516,28 @@ 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")
+
+configure_file(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
+  ${CMake_BINARY_DIR}/${CMake_TestDir}/.NoDartCoverage)
+
 if(BUILD_TESTING)
   include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
 endif()
@@ -558,10 +578,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)

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

Summary of changes:


hooks/post-receive
-- 
CMake