diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-04 20:03:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-04 20:07:23 (GMT) |
| commit | 562e69dd500f3b1558ab3ffd62679b8b4b0df842 (patch) | |
| tree | 9a4f35859e54ff0bc3413b842531481ce157179b /Tests/CMakeLists.txt | |
| parent | d3b36a90b661543f937daffafdf386c91a9592f5 (diff) | |
| download | CMake-562e69dd500f3b1558ab3ffd62679b8b4b0df842.zip CMake-562e69dd500f3b1558ab3ffd62679b8b4b0df842.tar.gz CMake-562e69dd500f3b1558ab3ffd62679b8b4b0df842.tar.bz2 | |
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.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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() |