mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-24 16:49:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindXCTest-bundle-inject' into release-3.19

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

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5786
This commit is contained in:
Brad King
2021-02-09 13:25:20 +00:00
committed by Kitware Robot
parent 263fd22fd8 eafe740ead
commit 340ca27f8d
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
XCODE_ATTRIBUTE_BUNDLE_LOADER "$(TEST_HOST)"
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
LIBRARY_OUTPUT_DIRECTORY "$<TARGET_BUNDLE_CONTENT_DIR:${testee}>/PlugIns")
LIBRARY_OUTPUT_DIRECTORY "${_output_directory}")
endif()
else(XCODE)
target_link_libraries(${target}