diff options
| author | Yauheni Khnykin <yauheni.khnykin@here.com> | 2021-07-22 10:40:50 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-26 13:31:10 -0400 |
| commit | 0b5301a778cb22b1179dd21d709494dfe74add41 (patch) | |
| tree | d5effa35b740fc09f12ef804ad823f285b208f78 /Modules/FindXCTest.cmake | |
| parent | 0615aeffbfa9e1e23dd24af640fdaddea7be9a94 (diff) | |
| download | cmake-0b5301a778cb22b1179dd21d709494dfe74add41.tar.gz | |
FindXCTest: Fix output directory for test bundle with Xcode 12.5
The fix from commit eafe740ead (FindXCTest: Fix output directory for
test bundle with new build system, 2021-02-09, v3.19.5~5^2) is not
necessary with Xcode 12.5, which seems to have changed/fixed the
behaviour again.
Fixes: #22462
Diffstat (limited to 'Modules/FindXCTest.cmake')
| -rw-r--r-- | Modules/FindXCTest.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindXCTest.cmake b/Modules/FindXCTest.cmake index 48371e620b..00729bc273 100644 --- a/Modules/FindXCTest.cmake +++ b/Modules/FindXCTest.cmake @@ -156,8 +156,9 @@ function(xctest_add_bundle target testee) XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)" XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>") if(XCODE_VERSION VERSION_GREATER_EQUAL 7.3) - # CMAKE_XCODE_BUILD_SYSTEM equals 12 means that at least Xcode 11.x is used. + # The Xcode "new build system" used a different path until Xcode 12.5. if(CMAKE_XCODE_BUILD_SYSTEM EQUAL 12 AND + XCODE_VERSION VERSION_LESS 12.5 AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(_output_directory "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>") else() |