Преглед изворни кода

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.
Brad King пре 12 година
родитељ
комит
5229f2df63
1 измењених фајлова са 5 додато и 1 уклоњено
  1. 5 1
      Tests/CMakeLists.txt

+ 5 - 1
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}")