Tests: Activate tests accidentally excluded from Xcode
The generator name is "Xcode", not "XCode". Fix this typo. Explicitly exclude the SubDirSpaces test on Xcode because it does not work. Also tell the RunCMake.File_Generate test when Xcode is not multi-config so it can exlcude the OutputConflict case. Inspired-by: Daniele E. Domenichelli <daniele.domenichelli@iit.it>
This commit is contained in:
parent
7bc8450251
commit
3526478cc0
|
@ -77,7 +77,7 @@ if(BUILD_TESTING)
|
|||
# some old versions of make simply cannot handle spaces in paths
|
||||
if (MAKE_IS_GNU OR
|
||||
CMAKE_MAKE_PROGRAM MATCHES "nmake|gmake|wmake" OR
|
||||
CMAKE_GENERATOR MATCHES "Visual Studio|XCode|Borland")
|
||||
CMAKE_GENERATOR MATCHES "Visual Studio|Xcode|Borland")
|
||||
set(MAKE_SUPPORTS_SPACES 1)
|
||||
else()
|
||||
set(MAKE_SUPPORTS_SPACES 0)
|
||||
|
@ -1502,7 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
|||
)
|
||||
endif()
|
||||
|
||||
if(MAKE_SUPPORTS_SPACES)
|
||||
if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL "Xcode")
|
||||
add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/SubDirSpaces"
|
||||
|
|
|
@ -18,6 +18,7 @@ endif()
|
|||
|
||||
if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
|
||||
set(TargetSources_ARGS -DXCODE_BELOW_2=1)
|
||||
set(File_Generate_ARGS -DXCODE_BELOW_2=1)
|
||||
endif()
|
||||
|
||||
add_RunCMake_test(CMP0019)
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
include(RunCMake)
|
||||
|
||||
run_cmake(CommandConflict)
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}" MATCHES "XCode" )
|
||||
run_cmake(OutputConflict)
|
||||
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode" AND NOT XCODE_BELOW_2)
|
||||
run_cmake(OutputConflict)
|
||||
endif()
|
||||
run_cmake(EmptyCondition1)
|
||||
run_cmake(EmptyCondition2)
|
||||
|
|
Loading…
Reference in New Issue