[Cmake-commits] CMake branch, next, updated. v2.8.12-4643-g7a4777e

[Nils Gladitz]

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  7a4777e0351350d51c18d4105229a9ae4274431e (commit)
       via  67b3f721cb347a0ea22168751ec04d573edd7d57 (commit)
      from  8cf25c725f97fd1a78b3453d0f10209b5a071a4e (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=7a4777e0351350d51c18d4105229a9ae4274431e
commit 7a4777e0351350d51c18d4105229a9ae4274431e
Merge: 8cf25c7 67b3f72
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Oct 29 18:47:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 29 18:47:00 2013 -0400

    Merge topic 'fix-ninja-launcher-errors-from-custom' into next
    
    67b3f72 Tests: limit new launcher test to generators that support launchers


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67b3f721cb347a0ea22168751ec04d573edd7d57
commit 67b3f721cb347a0ea22168751ec04d573edd7d57
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Oct 29 23:46:12 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Oct 29 23:46:12 2013 +0100

    Tests: limit new launcher test to generators that support launchers

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index fe504b8..7c939ed 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2344,14 +2344,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
       )
 
-    configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestLaunchers/test.cmake.in"
-      "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/test.cmake" @ONLY ESCAPE_QUOTES)
-    add_test(CTestTestLaunchers ${CMAKE_CTEST_COMMAND}
-      -S "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/test.cmake" -V
-      --output-log "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/testOutput.log"
-      )
-    set_tests_properties(CTestTestLaunchers PROPERTIES
-      PASS_REGULAR_EXPRESSION "CTEST_TEST_LAUNCHER_SUCCESS")
+    if("${CMAKE_TEST_GENERATOR}" MATCHES "Makefiles" OR "${CMAKE_TEST_GENERATOR}" MATCHES "Ninja")
+      configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestLaunchers/test.cmake.in"
+        "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/test.cmake" @ONLY ESCAPE_QUOTES)
+      add_test(CTestTestLaunchers ${CMAKE_CTEST_COMMAND}
+        -S "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/test.cmake" -V
+        --output-log "${CMake_BINARY_DIR}/Tests/CTestTestLaunchers/testOutput.log"
+        )
+      set_tests_properties(CTestTestLaunchers PROPERTIES
+        PASS_REGULAR_EXPRESSION "CTEST_TEST_LAUNCHER_SUCCESS")
+    endif()
 
     configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestChecksum/test.cmake.in"
       "${CMake_BINARY_DIR}/Tests/CTestTestChecksum/test.cmake" @ONLY

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

Summary of changes:
 Tests/CMakeLists.txt |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake