-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Match the CMake install path for _InternalSwiftScan with its installed location on Windows #64364
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.
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
Match the CMake install path for _InternalSwiftScan with its installed location on Windows #64364
Conversation
…d location on Windows
RUNTIME DESTINATION "bin" COMPONENT compiler) | ||
|
||
swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/DependencyScan/" | ||
DESTINATION "include/${SWIFT_SCAN_LIB_NAME}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be ${CMAKE_INSTALL_INCLUDE_DIR}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes but that is #64281 . The changes will conflict and I will add the ${CMAKE_INSTALL_INCLUDE_DIR}
in the PR I get to rebase on the other.
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT compiler | ||
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT compiler | ||
RUNTIME DESTINATION "bin" COMPONENT compiler) | ||
if(CMAKE_SYSTEM_NAME STREQUAL Windows) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if this should use SWIFT_HOST_SDK_VARIANT
or something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe but it looks like it's already working ok so... different change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You cross-compiled with multiple SDKs?
CC: @DougGregor @DougGregor this might be an interesting case. We are using |
Closing due to age |
Updates the CMake install directory paths for
_InternalSwiftScan
such that files are at the same relative location in the build output as they end up after running a Swift installer (so the cmake-installed directory and an installer-installed Swift can be used interchangeably). The/swift/windows
component of the path was not useful on Windows.(see further explanation by compnerd in comments below)
Co-dependent with swiftlang/swift-installer-scripts#179