mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-06 23:29:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19

Browse Source 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
This commit is contained in:
Brad King
2020-11-06 12:58:25 +00:00
committed by Kitware Robot
parent dd8c91a4f3 4c6797e03e
commit b80e39d0f6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/Platform/Darwin-Initialize.cmake
View File

@@ -145,20 +145,26 @@ function(_apple_resolve_supported_archs_for_sdk_from_system_lib sdk_path ret ret
# Newer SDKs ship text based dylib stub files which contain the architectures supported by the
# library in text form.
if(EXISTS "${system_lib_tbd_path}")
file(STRINGS "${system_lib_tbd_path}" tbd_lines REGEX "^archs: +\\[.+\\]")
file(STRINGS "${system_lib_tbd_path}" tbd_lines REGEX "^(archs|targets): +\\[.+\\]")
if(NOT tbd_lines)
set(${ret_failed} TRUE PARENT_SCOPE)
return()
endif()
# The tbd architectures line looks like the following:
# archs: [ armv7, armv7s, arm64, arm64e ]
# archs: [ armv7, armv7s, arm64, arm64e ]
# or for version 4 TBD files:
# targets: [ armv7-ios, armv7s-ios, arm64-ios, arm64e-ios ]
list(GET tbd_lines 0 first_arch_line)
string(REGEX REPLACE
"archs: +\\[ (.+) \\]" "\\1" arches_comma_separated "${first_arch_line}")
"(archs|targets): +\\[ (.+) \\]" "\\2" arches_comma_separated "${first_arch_line}")
string(STRIP "${arches_comma_separated}" arches_comma_separated)
string(REPLACE "," ";" arch_list "${arches_comma_separated}")
string(REPLACE " " "" arch_list "${arch_list}")
# Remove -platform suffix from target (version 4 only)
string(REGEX REPLACE "-[a-z-]+" "" arch_list "${arch_list}")
if(NOT arch_list)
set(${ret_failed} TRUE PARENT_SCOPE)
return()