mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ios-combined-prune-archs'

Browse Source 
5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets
79098d23eb Tests: Avoid warnings about unused arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5111
This commit is contained in:
Brad King
2020-08-17 18:52:03 +00:00
committed by Kitware Robot
parent 35d8543f25 5852b8867f
commit 3313bf06eb
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/CMakeIOSInstallCombined.cmake
View File

@@ -80,6 +80,17 @@ function(_ios_install_combined_get_valid_archs sdk resultvar)
cmake_policy(POP)
endfunction()
# Make both arch lists a disjoint set by preferring the current SDK
# (starting with Xcode 12 arm64 is available as device and simulator arch on iOS)
function(_ios_install_combined_prune_common_archs corr_sdk corr_archs_var this_archs_var)
list(REMOVE_ITEM ${corr_archs_var} ${${this_archs_var}})
string(REPLACE ";" " " printable "${${corr_archs_var}}")
_ios_install_combined_message("Architectures (${corr_sdk}) after pruning: ${printable}")
set("${corr_archs_var}" "${${corr_archs_var}}" PARENT_SCOPE)
endfunction()
# Final target can contain more architectures that specified by SDK. This
# function will run 'lipo -info' and parse output. Result will be returned
# as a CMake list.
@@ -266,8 +277,9 @@ function(ios_install_combined target destination)
_ios_install_combined_detect_sdks(this_sdk corr_sdk)
# Get architectures of the target
_ios_install_combined_get_valid_archs("${corr_sdk}" corr_valid_archs)
_ios_install_combined_get_valid_archs("${this_sdk}" this_valid_archs)
_ios_install_combined_get_valid_archs("${corr_sdk}" corr_valid_archs)
_ios_install_combined_prune_common_archs("${corr_sdk}" corr_valid_archs this_valid_archs)
# Return if there are no valid architectures for the SDK.
# (note that library already installed)