kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix_Xcode_generator_name' 

3526478c Tests: Activate tests accidentally excluded from Xcode
This commit is contained in:
Brad King 2014-07-18 10:56:57 -04:00 committed by CMake Topic Stage
parent a67f0b6afd 3526478cc0
commit 494f9e0bff
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/CMakeLists.txt
View File

@ -77,7 +77,7 @@ if(BUILD_TESTING)
# some old versions of make simply cannot handle spaces in paths # some old versions of make simply cannot handle spaces in paths
if (MAKE_IS_GNU OR if (MAKE_IS_GNU OR
CMAKE_MAKE_PROGRAM MATCHES "nmake|gmake|wmake" 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) set(MAKE_SUPPORTS_SPACES 1)
else() else()
set(MAKE_SUPPORTS_SPACES 0) set(MAKE_SUPPORTS_SPACES 0)
@ -1502,7 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
) )
endif() endif()
if(MAKE_SUPPORTS_SPACES) if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL "Xcode")
add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND} add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/SubDirSpaces" "${CMake_SOURCE_DIR}/Tests/SubDirSpaces"

1
Tests/RunCMake/CMakeLists.txt
View File

@ -18,6 +18,7 @@ endif()
if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2) if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
set(TargetSources_ARGS -DXCODE_BELOW_2=1) set(TargetSources_ARGS -DXCODE_BELOW_2=1)
set(File_Generate_ARGS -DXCODE_BELOW_2=1)
endif() endif()
add_RunCMake_test(CMP0019) add_RunCMake_test(CMP0019)

4
Tests/RunCMake/File_Generate/RunCMakeTest.cmake
View File

@ -1,8 +1,8 @@
include(RunCMake) include(RunCMake)
run_cmake(CommandConflict) run_cmake(CommandConflict)
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}" MATCHES "XCode" ) if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode" AND NOT XCODE_BELOW_2)
run_cmake(OutputConflict) run_cmake(OutputConflict)
endif() endif()
run_cmake(EmptyCondition1) run_cmake(EmptyCondition1)
run_cmake(EmptyCondition2) run_cmake(EmptyCondition2)