diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-15 14:15:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 16:30:50 (GMT) |
| commit | 5229f2df63369af1734783ee190cbfc7c41fac8f (patch) | |
| tree | 1579885ed674bbfae13c3164dd535eaf98e22d2d /Tests | |
| parent | 72dd738bd4856dcd2a483e732a26f49e9c6dfcc4 (diff) | |
| download | CMake-5229f2df63369af1734783ee190cbfc7c41fac8f.zip CMake-5229f2df63369af1734783ee190cbfc7c41fac8f.tar.gz CMake-5229f2df63369af1734783ee190cbfc7c41fac8f.tar.bz2 | |
Tests: Do not use an explicit make program for VS generators
Do not pass the CMAKE_MAKE_PROGRAM cache entry to tests when using the
VS generators. Allow them to pick the correct build tool automatically.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 4e016e1..48abfae 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -47,7 +47,11 @@ configure_file(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in if(BUILD_TESTING) set(CMAKE_TEST_DEVENV "") if(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") + if(CMAKE_TEST_GENERATOR MATCHES "Visual Studio") + set(CMAKE_TEST_MAKEPROGRAM "") + else() + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") + endif() if(CMAKE_TEST_GENERATOR MATCHES "Visual Studio [7-9] " AND NOT CMAKE_MAKE_PROGRAM MATCHES "[mM][sS][bB][uU][iI][lL][dD]\\.[eE][xX][eE]") set(CMAKE_TEST_DEVENV "${CMAKE_MAKE_PROGRAM}") |