diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2020-09-25 07:30:33 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2020-09-25 07:38:30 (GMT) |
| commit | 2092ab08fe0aba0ee7efc8353d27bfc22bf73b61 (patch) | |
| tree | 74c26fcf5c13b26e01983701b46154f00f6621fb /Tests/RunCMake | |
| parent | 62ce9e16e0651ea16f2e7652403c273825f2ace1 (diff) | |
| download | CMake-2092ab08fe0aba0ee7efc8353d27bfc22bf73b61.zip CMake-2092ab08fe0aba0ee7efc8353d27bfc22bf73b61.tar.gz CMake-2092ab08fe0aba0ee7efc8353d27bfc22bf73b61.tar.bz2 | |
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
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 983061b..62163ac 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/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) |