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.
This commit is contained in:
parent
daf0a5fede
commit
3c01ee5adc
|
@ -117,17 +117,6 @@ macro(CMAKE_SETUP_TESTING)
|
||||||
set(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}")
|
set(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}")
|
||||||
set(CMAKE_TEST_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}")
|
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)
|
set(CMAKE_TEST_SYSTEM_LIBRARIES 0)
|
||||||
foreach(util CURL EXPAT XMLRPC ZLIB)
|
foreach(util CURL EXPAT XMLRPC ZLIB)
|
||||||
if(CMAKE_USE_SYSTEM_${util})
|
if(CMAKE_USE_SYSTEM_${util})
|
||||||
|
|
|
@ -1497,12 +1497,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
||||||
endif ()
|
endif ()
|
||||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SubDir")
|
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SubDir")
|
||||||
|
|
||||||
if(CMAKE_TEST_MSVC)
|
if(MSVC)
|
||||||
ADD_TEST_MACRO(ForceInclude foo)
|
ADD_TEST_MACRO(ForceInclude foo)
|
||||||
ADD_TEST_MACRO(PDBDirectoryAndName myexe)
|
ADD_TEST_MACRO(PDBDirectoryAndName myexe)
|
||||||
ADD_TEST_MACRO(PrecompiledHeader foo)
|
ADD_TEST_MACRO(PrecompiledHeader foo)
|
||||||
endif()
|
endif()
|
||||||
if(CMAKE_TEST_MSVC OR
|
if(MSVC OR
|
||||||
"${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")
|
"${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")
|
||||||
ADD_TEST_MACRO(ModuleDefinition example_exe)
|
ADD_TEST_MACRO(ModuleDefinition example_exe)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue