mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindXCTest: Fix output directory for test bundle with new build system

Browse Source 
The output directory was still correct for macOS with the new build system,
but not for iOS.

Fixes: #20662
This commit is contained in:
Yauheni Khnykin
2021-02-09 10:15:08 +11:00
committed by Craig Scott
parent 58167b3eb0
commit eafe740ead
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindXCTest.cmake
View File

@@ -155,9 +155,16 @@ function(xctest_add_bundle target testee)
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)" XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>") XCODE_ATTRIBUTE_TEST_HOST "$<TARGET_FILE:${testee}>")
if(NOT XCODE_VERSION VERSION_LESS 7.3) if(XCODE_VERSION VERSION_GREATER_EQUAL 7.3)
# CMAKE_XCODE_BUILD_SYSTEM equals 12 means that at least Xcode 11.x is used.
if(CMAKE_XCODE_BUILD_SYSTEM EQUAL 12 AND
NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(_output_directory "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>")
else()
set(_output_directory "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>/PlugIns")
endif()
set_target_properties(${target} PROPERTIES set_target_properties(${target} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>/PlugIns") LIBRARY_OUTPUT_DIRECTORY "${_output_directory}")
endif() endif()
else(XCODE) else(XCODE)
target_link_libraries(${target} target_link_libraries(${target}