diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-03 17:39:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-03 20:26:48 (GMT) |
| commit | 3c01ee5adceafb0febd9cedab9211f830f953c03 (patch) | |
| tree | e562cc2f1cd8991c7655e9f429718c6a71f94873 | |
| parent | daf0a5fedebb2dac66ac26516eeeff502ddcf432 (diff) | |
| download | CMake-3c01ee5adceafb0febd9cedab9211f830f953c03.zip CMake-3c01ee5adceafb0febd9cedab9211f830f953c03.tar.gz CMake-3c01ee5adceafb0febd9cedab9211f830f953c03.tar.bz2 | |
Tests: Drop CMAKE_TEST_MSVC and test MSVC directly
Now that we no longer support running tests using a different generator
we can trust the MSVC platform indicator directly.
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c2c20b..b9f96e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,17 +117,6 @@ macro(CMAKE_SETUP_TESTING) set(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}") set(CMAKE_TEST_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}") - # Are we testing with the MSVC compiler? - set(CMAKE_TEST_MSVC 0) - if(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR) - set(CMAKE_TEST_MSVC 1) - else() - if("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR - "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio") - set(CMAKE_TEST_MSVC 1) - endif() - endif() - set(CMAKE_TEST_SYSTEM_LIBRARIES 0) foreach(util CURL EXPAT XMLRPC ZLIB) if(CMAKE_USE_SYSTEM_${util}) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index fa98a2b..9ca354d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1497,12 +1497,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ endif () list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SubDir") - if(CMAKE_TEST_MSVC) + if(MSVC) ADD_TEST_MACRO(ForceInclude foo) ADD_TEST_MACRO(PDBDirectoryAndName myexe) ADD_TEST_MACRO(PrecompiledHeader foo) endif() - if(CMAKE_TEST_MSVC OR + if(MSVC OR "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles") ADD_TEST_MACRO(ModuleDefinition example_exe) endif() |