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

Merge topic 'xcode15-fix-RunCMake-TargetSources' 

0366ba5d Tests: Fix RunCMake.TargetSources on Xcode 1.5
This commit is contained in:
Brad King 2014-06-09 10:28:36 -04:00 committed by CMake Topic Stage
parent 81ddcaa67b 0366ba5db6
commit bf022b7963
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/RunCMake/CMakeLists.txt
View File

@ -16,6 +16,10 @@ if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 3)
set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1) set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
endif() endif()
if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
set(TargetSources_ARGS -DXCODE_BELOW_2=1)
endif()
add_RunCMake_test(CMP0019) add_RunCMake_test(CMP0019)
add_RunCMake_test(CMP0022) add_RunCMake_test(CMP0022)
add_RunCMake_test(CMP0026) add_RunCMake_test(CMP0026)

6
Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
View File

@ -5,7 +5,7 @@ CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)
+ .*
CMake Debug Log at OriginDebug.cmake:16 \(set_property\): CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
Used sources for target OriginDebug: Used sources for target OriginDebug:
@ -13,7 +13,7 @@ CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)
+ .*
CMake Debug Log at OriginDebug.cmake:20 \(target_sources\): CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
Used sources for target OriginDebug: Used sources for target OriginDebug:
@ -21,7 +21,7 @@ CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)
+ .*
CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\): CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
Used sources for target OriginDebug: Used sources for target OriginDebug:

3
Tests/RunCMake/TargetSources/RunCMakeTest.cmake
View File

@ -1,7 +1,6 @@
include(RunCMake) include(RunCMake)
if(RunCMake_GENERATOR MATCHES Xcode if(RunCMake_GENERATOR MATCHES "Visual Studio|Xcode" AND NOT XCODE_BELOW_2)
OR RunCMake_GENERATOR MATCHES "Visual Studio")
run_cmake(ConfigNotAllowed) run_cmake(ConfigNotAllowed)
run_cmake(OriginDebugIDE) run_cmake(OriginDebugIDE)
else() else()