From 562e69dd500f3b1558ab3ffd62679b8b4b0df842 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 4 May 2015 16:03:43 -0400 Subject: Tests: Enable devenv tests on VS >= 10 The VSExcludeFromDefaultBuild have not been enabled on VS >= 10 since commit v3.0.0-rc1~260^2~9 (Tests: Simplify VSExcludeFromDefaultBuild configuration, 2013-11-14). Since commit v3.0.0-rc1~260^2~2 (VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables, 2013-12-04) we can simply check the CMAKE_VS_DEVENV_COMMAND variable for a devenv tool to use for the test. --- Tests/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 07545ae..a6cefa2 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -46,7 +46,9 @@ configure_file(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in # Testing if(BUILD_TESTING) set(CMake_TEST_DEVENV "") - if(CMAKE_GENERATOR MATCHES "Visual Studio [7-9] " AND + if(CMAKE_VS_DEVENV_COMMAND) + set(CMake_TEST_DEVENV "${CMAKE_VS_DEVENV_COMMAND}") + elseif(CMAKE_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}") endif() -- cgit v0.12