Skip to content

build: use the same pattern for detecting Darwin platforms #32182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2020
Merged

build: use the same pattern for detecting Darwin platforms #32182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,10 @@ function(_set_target_prefix_and_suffix target kind sdk)
endif()
endfunction()

function(is_darwin_based_sdk sdk_name out_var)
if ("${sdk_name}" STREQUAL "OSX" OR
"${sdk_name}" STREQUAL "IOS" OR
"${sdk_name}" STREQUAL "IOS_SIMULATOR" OR
"${sdk_name}" STREQUAL "TVOS" OR
"${sdk_name}" STREQUAL "TVOS_SIMULATOR" OR
"${sdk_name}" STREQUAL "WATCHOS" OR
"${sdk_name}" STREQUAL "WATCHOS_SIMULATOR")
set(${out_var} TRUE PARENT_SCOPE)
else()
set(${out_var} FALSE PARENT_SCOPE)
endif()
endfunction()

# Usage:
# _add_host_variant_c_compile_link_flags(name)
function(_add_host_variant_c_compile_link_flags name)
is_darwin_based_sdk("${SWIFT_HOST_VARIANT_SDK}" IS_DARWIN)
if(IS_DARWIN)
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
endif()

Expand All @@ -107,7 +92,7 @@ function(_add_host_variant_c_compile_link_flags name)

set(_sysroot
"${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")
if(IS_DARWIN)
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
target_compile_options(${name} PRIVATE -isysroot;${_sysroot})
elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${_sysroot}" STREQUAL "/")
target_compile_options(${name} PRIVATE --sysroot=${_sysroot})
Expand All @@ -122,7 +107,7 @@ function(_add_host_variant_c_compile_link_flags name)
endif()
endif()

if(IS_DARWIN)
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
# We collate -F with the framework path to avoid unwanted deduplication
# of options by target_compile_options -- this way no undesired
# side effects are introduced should a new search path be added.
Expand Down
14 changes: 14 additions & 0 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
include(AddSwift)
include(SwiftSource)

function(is_darwin_based_sdk sdk_name out_var)
if ("${sdk_name}" STREQUAL "OSX" OR
"${sdk_name}" STREQUAL "IOS" OR
"${sdk_name}" STREQUAL "IOS_SIMULATOR" OR
"${sdk_name}" STREQUAL "TVOS" OR
"${sdk_name}" STREQUAL "TVOS_SIMULATOR" OR
"${sdk_name}" STREQUAL "WATCHOS" OR
"${sdk_name}" STREQUAL "WATCHOS_SIMULATOR")
set(${out_var} TRUE PARENT_SCOPE)
else()
set(${out_var} FALSE PARENT_SCOPE)
endif()
endfunction()

function(add_dependencies_multiple_targets)
cmake_parse_arguments(
ADMT # prefix
Expand Down