[Cmake-commits] CMake branch, next, updated. v2.8.7-3368-gc25ef67

Ben Boeckel ben.boeckel at kitware.com
Thu Mar 29 14:03:06 EDT 2012


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  c25ef678069669da81d0ac334b1a4c25c1d6358e (commit)
       via  d5318e00cb9a0b148f6f4484070ce803543dc070 (commit)
      from  565a82df4140d14ae3ec80a5f0696b0569dc7022 (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=c25ef678069669da81d0ac334b1a4c25c1d6358e
commit c25ef678069669da81d0ac334b1a4c25c1d6358e
Merge: 565a82d d5318e0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Mar 29 14:03:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 29 14:03:03 2012 -0400

    Merge topic 'dev/granular-test-targets-ninja' into next
    
    d5318e0 Create granular targets for Ninja generators too


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5318e00cb9a0b148f6f4484070ce803543dc070
commit d5318e00cb9a0b148f6f4484070ce803543dc070
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Thu Mar 29 12:05:10 2012 -0400
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Thu Mar 29 13:46:15 2012 -0400

    Create granular targets for Ninja generators too

diff --git a/Modules/CTestTargets.cmake b/Modules/CTestTargets.cmake
index d66874d..bc4d964 100644
--- a/Modules/CTestTargets.cmake
+++ b/Modules/CTestTargets.cmake
@@ -69,7 +69,7 @@ IF(NOT _CTEST_TARGETS_ADDED)
   ENDFOREACH(mode)
 
   # For Makefile generators add more granular targets.
-  IF("${CMAKE_GENERATOR}" MATCHES Make)
+  IF("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
     # Make targets for Experimental builds
     FOREACH(mode Nightly Experimental Continuous)
       FOREACH(testtype
@@ -83,7 +83,7 @@ IF(NOT _CTEST_TARGETS_ADDED)
         SET_PROPERTY(TARGET ${mode}${testtype} PROPERTY FOLDER "CTestDashboardTargets")
       ENDFOREACH(testtype)
     ENDFOREACH(mode)
-  ENDIF("${CMAKE_GENERATOR}" MATCHES Make)
+  ENDIF("${CMAKE_GENERATOR}" MATCHES "(Ninja|Make)")
 
   # If requested, add an alias that is the equivalent of the built-in "test"
   # or "RUN_TESTS" target:

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

Summary of changes:
 Modules/CTestTargets.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list