Browse Source

xcode: conditionally enable combined install tests

The new Xcode 12 build system does not support recursive
invocation. Therefore lazily triggered builds for the
corresponding platform which run during the `install` target
fail with:

```
error: unable to attach DB: error: accessing build database
```

While looking for a work-around we conditionally disable those
tests.

Issue: #21206
Gregor Jasny 5 years ago
parent
commit
2092ab08fe
1 changed files with 1 additions and 6 deletions
  1. 1 6
      Tests/RunCMake/XcodeProject/RunCMakeTest.cmake

+ 1 - 6
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake

@@ -108,11 +108,6 @@ XcodeRemoveExcessiveISystem()
 # Isolate device tests from host architecture selection.
 unset(ENV{CMAKE_OSX_ARCHITECTURES})
 
-if(XCODE_VERSION VERSION_GREATER_EQUAL 12)
-  # FIXME: Restore device tests and fix them for the Xcode "new build system"
-  return()
-endif()
-
 # Use a single build tree for a few tests without cleaning.
 
 if(NOT XCODE_VERSION VERSION_LESS 5)
@@ -211,7 +206,7 @@ if(NOT XCODE_VERSION VERSION_LESS 7)
   unset(RunCMake_TEST_OPTIONS)
 endif()
 
-if(NOT XCODE_VERSION VERSION_LESS 6)
+if(XCODE_VERSION VERSION_GREATER_EQUAL 6 AND XCODE_VERSION VERSION_LESS 12)
   # XcodeIOSInstallCombined
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/XcodeIOSInstallCombined-build)
   set(RunCMake_TEST_NO_CLEAN 1)