[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-403-g92925b7

[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  92925b722afeb6fddc56667127c9f79b23561d2d (commit)
       via  6d3b552e8786aa0dcb07093273e441714cac103d (commit)
      from  882f27a57b2b069925790ec2228cffb8307268c5 (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=92925b722afeb6fddc56667127c9f79b23561d2d
commit 92925b722afeb6fddc56667127c9f79b23561d2d
Merge: 882f27a 6d3b552
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 1 03:13:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 1 03:13:41 2014 -0500

    Merge topic 'alt-test-generator' into next
    
    6d3b552e Modify logic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d3b552e8786aa0dcb07093273e441714cac103d
commit 6d3b552e8786aa0dcb07093273e441714cac103d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 1 09:13:13 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 1 09:13:13 2014 +0100

    Modify logic.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4cd2d1a..4703610 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -61,8 +61,7 @@ if(BUILD_TESTING)
   if("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles" OR ("${CMAKE_TEST_GENERATOR}" MATCHES Ninja AND NOT WIN32))
     set(TEST_CompileCommandOutput 1)
   endif()
-  if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
-      OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
+  if(CMAKE_TEST_DIFFERENT_GENERATOR)
     set(TEST_CompileCommandOutput 0)
   endif()
 
@@ -100,8 +99,7 @@ if(BUILD_TESTING)
     list(APPEND build_options -DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_TEST_MAKEPROGRAM})
   endif()
 
-  if (CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
-      AND CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
+  if(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
     add_subdirectory(CMakeLib)
   endif()
   add_subdirectory(CMakeOnly)

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

Summary of changes:
 Tests/CMakeLists.txt |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake