Skip to content

CMake: do not assume target SDKs are provided when evaluting NOT... #73939

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
edymtt merged 1 commit into from
May 28, 2024
Merged

CMake: do not assume target SDKs are provided when evaluting NOT... #73939

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
26 changes: 16 additions & 10 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1935,11 +1935,14 @@ function(add_swift_target_library name)
list_replace(SWIFTLIB_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_DARWIN_PLATFORMS}")

# Support adding a "NOT" on the front to mean all SDKs except the following
list(GET SWIFTLIB_TARGET_SDKS 0 first_sdk)
if("${first_sdk}" STREQUAL "NOT")
list(REMOVE_AT SWIFTLIB_TARGET_SDKS 0)
list_subtract("${SWIFT_SDKS}" "${SWIFTLIB_TARGET_SDKS}"
"SWIFTLIB_TARGET_SDKS")
list(LENGTH SWIFTLIB_TARGET_SDKS number_of_target_sdks)
if(number_of_target_sdks GREATER_EQUAL "1")
list(GET SWIFTLIB_TARGET_SDKS 0 first_sdk)
if("${first_sdk}" STREQUAL "NOT")
list(REMOVE_AT SWIFTLIB_TARGET_SDKS 0)
list_subtract("${SWIFT_SDKS}" "${SWIFTLIB_TARGET_SDKS}"
"SWIFTLIB_TARGET_SDKS")
endif()
endif()

list_intersect(
Expand Down Expand Up @@ -2985,11 +2988,14 @@ function(add_swift_target_executable name)
list_replace(SWIFTEXE_TARGET_TARGET_SDKS ALL_APPLE_PLATFORMS "${SWIFT_DARWIN_PLATFORMS}")

# Support adding a "NOT" on the front to mean all SDKs except the following
list(GET SWIFTEXE_TARGET_TARGET_SDKS 0 first_sdk)
if("${first_sdk}" STREQUAL "NOT")
list(REMOVE_AT SWIFTEXE_TARGET_TARGET_SDKS 0)
list_subtract("${SWIFT_SDKS}" "${SWIFTEXE_TARGET_TARGET_SDKS}"
"SWIFTEXE_TARGET_TARGET_SDKS")
list(LENGTH SWIFTEXE_TARGET_TARGET_SDKS number_of_target_sdks)
if(number_of_target_sdks GREATER_EQUAL "1")
list(GET SWIFTEXE_TARGET_TARGET_SDKS 0 first_sdk)
if("${first_sdk}" STREQUAL "NOT")
list(REMOVE_AT SWIFTEXE_TARGET_TARGET_SDKS 0)
list_subtract("${SWIFT_SDKS}" "${SWIFTEXE_TARGET_TARGET_SDKS}"
"SWIFTEXE_TARGET_TARGET_SDKS")
endif()
endif()

list_intersect(
Expand Down