diff options
author | David Cole <david.cole@kitware.com> | 2012-12-05 10:29:36 -0500 |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-12-05 10:29:36 -0500 |
commit | 00dc0ce592285ed990ef9a8e747f1dcde2830866 (patch) | |
tree | 4e882697b97387a65ed0aef389d2721743b9d76b /Modules | |
parent | 7c2891daebc971380c1945b5976937eebbf4b79e (diff) | |
parent | 9fc2e20244a2c8b01c23cd06031388aa85e50117 (diff) | |
download | cmake-00dc0ce592285ed990ef9a8e747f1dcde2830866.tar.gz |
Merge topic 'ninja_launchers'
9fc2e20 Ninja: fix usage of cldeps with ctest launchers
965358f enable CTEST_USE_LAUNCHERS with Ninja too
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CTestUseLaunchers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CTestUseLaunchers.cmake b/Modules/CTestUseLaunchers.cmake index 6731d37542..24f5f2e16d 100644 --- a/Modules/CTestUseLaunchers.cmake +++ b/Modules/CTestUseLaunchers.cmake @@ -35,7 +35,7 @@ if(NOT DEFINED CTEST_USE_LAUNCHERS AND DEFINED ENV{CTEST_USE_LAUNCHERS_DEFAULT}) CACHE INTERNAL "CTEST_USE_LAUNCHERS initial value from ENV") endif() -if(NOT "${CMAKE_GENERATOR}" MATCHES "Make") +if(NOT "${CMAKE_GENERATOR}" MATCHES "Make|Ninja") set(CTEST_USE_LAUNCHERS 0) endif() |