Skip to content

host tools DCE #20718

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 3 commits into from
Nov 26, 2018
Merged

host tools DCE #20718

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47e0608
add_swift_host_tool: DCE SWIFT_MODULE_DEPENDS (NFC)
compnerd Nov 17, 2018
9110ae7
add_swift_host_tool: DCE COMPILE_FLAGS (NFC)
compnerd Nov 17, 2018
1f9feb5
add_swift_host_tool: DCE DEPENDS (NFC)
compnerd Nov 17, 2018
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
16 changes: 1 addition & 15 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2359,10 +2359,7 @@ endmacro()

function(add_swift_host_tool executable)
set(ADDSWIFTHOSTTOOL_multiple_parameter_options
SWIFT_COMPONENT
COMPILE_FLAGS
DEPENDS
SWIFT_MODULE_DEPENDS)
SWIFT_COMPONENT)

cmake_parse_arguments(
ADDSWIFTHOSTTOOL # prefix
Expand All @@ -2371,21 +2368,10 @@ function(add_swift_host_tool executable)
"${ADDSWIFTHOSTTOOL_multiple_parameter_options}" # multi-value args
${ARGN})

# Configure variables for this subdirectory.
set(VARIANT_SUFFIX "-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
set(MODULE_VARIANT_SUFFIX "-swiftmodule${VARIANT_SUFFIX}")

foreach(mod ${ADDSWIFTHOSTTOOL_SWIFT_MODULE_DEPENDS})
list(APPEND ADDSWIFTHOSTTOOL_DEPENDS "swift${mod}${MODULE_VARIANT_SUFFIX}")
list(APPEND ADDSWIFTHOSTTOOL_DEPENDS "swift${mod}${VARIANT_SUFFIX}")
endforeach()

# Create the executable rule.
add_swift_executable(
${executable}
${ADDSWIFTHOSTTOOL_UNPARSED_ARGUMENTS}
DEPENDS ${ADDSWIFTHOSTTOOL_DEPENDS}
COMPILE_FLAGS ${ADDSWIFTHOSTTOOL_COMPILE_FLAGS}
)

# And then create the install rule if we are asked to.
Expand Down