Procházet zdrojové kódy

Tests: Fix RunCMake.TargetSources on Xcode 1.5

Xcode 1.5 does not support multiple configurations.  The generator also
adds some sources internally that cause extra OriginDebug output.
Update the expected output to tolerate it.
Brad King před 11 roky
rodič
revize
0366ba5db6

+ 4 - 0
Tests/RunCMake/CMakeLists.txt

@@ -16,6 +16,10 @@ if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 3)
   set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
 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(CMP0022)
 add_RunCMake_test(CMP0026)

+ 3 - 3
Tests/RunCMake/TargetSources/OriginDebug-stderr.txt

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

+ 1 - 2
Tests/RunCMake/TargetSources/RunCMakeTest.cmake

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