[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-412-gc7fba0c

[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  c7fba0c2ac5bdde719cc931896c71b52bdb1bb69 (commit)
       via  29a5096abf3191a4ab5f098bfbac02b150216356 (commit)
      from  b667da5d9a0006132e56357931d3288f01b23b1f (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=c7fba0c2ac5bdde719cc931896c71b52bdb1bb69
commit c7fba0c2ac5bdde719cc931896c71b52bdb1bb69
Merge: b667da5 29a5096
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 2 06:02:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 2 06:02:16 2014 -0500

    Merge topic 'alt-test-generator' into next
    
    29a5096a Move creation of NoDartCoverage file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29a5096abf3191a4ab5f098bfbac02b150216356
commit 29a5096abf3191a4ab5f098bfbac02b150216356
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Mar 2 12:00:32 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Mar 2 12:00:32 2014 +0100

    Move creation of NoDartCoverage file.
    
    Do it after populating the CMake_TestDir variable.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42b19da..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}/${CMake_TestDir}/.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)
@@ -537,6 +535,9 @@ if (CMAKE_TEST_DIFFERENT_GENERATOR)
 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()

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

Summary of changes:
 CMakeLists.txt |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake