Skip to content

Honor CMAKE_INSTALL_BINDIR #64281

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

Closed
wants to merge 2 commits into from
Closed

Honor CMAKE_INSTALL_BINDIR #64281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6117e8
Un-hardcode CMake install dirs
tristanlabelle Mar 10, 2023
5281a3e
Revert LIBDIR changes to scope down to BINDIR
tristanlabelle Mar 15, 2023
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
4 changes: 2 additions & 2 deletions cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ function(add_swift_host_library name)
swift_install_in_component(TARGETS ${name}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
RUNTIME DESTINATION bin COMPONENT dev)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev)
endif()

swift_is_installing_component(dev is_installing)
Expand Down Expand Up @@ -947,7 +947,7 @@ function(add_swift_host_tool executable)
add_dependencies(${ASHT_SWIFT_COMPONENT} ${executable})
swift_install_in_component(TARGETS ${executable}
RUNTIME
DESTINATION bin
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT ${ASHT_SWIFT_COMPONENT})

swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
Expand Down
2 changes: 1 addition & 1 deletion lib/SwiftDemangle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ target_link_libraries(swiftDemangle PRIVATE
add_dependencies(compiler swiftDemangle)
swift_install_in_component(TARGETS swiftDemangle
RUNTIME
DESTINATION "bin"
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT compiler
LIBRARY
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
Expand Down
4 changes: 2 additions & 2 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2361,7 +2361,7 @@ function(add_swift_target_library name)
add_dependencies(${SWIFTLIB_INSTALL_IN_COMPONENT} ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH})
swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
RUNTIME
DESTINATION "bin"
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
LIBRARY
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
Expand Down Expand Up @@ -2945,7 +2945,7 @@ function(add_swift_target_executable name)
add_dependencies(${install_in_component} ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH})
swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
RUNTIME
DESTINATION "bin"
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT "${install_in_component}"
LIBRARY
DESTINATION "libexec${LLVM_LIBDIR_SUFFIX}/swift/${resource_dir_sdk_subdir}/${SWIFT_PRIMARY_VARIANT_ARCH}"
Expand Down
4 changes: 2 additions & 2 deletions tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ macro(add_sourcekit_library name)
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}"
RUNTIME
DESTINATION "bin"
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT "${SOURCEKITLIB_INSTALL_IN_COMPONENT}")
swift_install_in_component(FILES ${SOURCEKITLIB_HEADERS}
DESTINATION "include/SourceKit"
Expand Down Expand Up @@ -464,7 +464,7 @@ macro(add_sourcekit_framework name)
DESTINATION lib${LLVM_LIBDIR_SUFFIX}
COMPONENT ${SOURCEKITFW_INSTALL_IN_COMPONENT}
RUNTIME
DESTINATION bin
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT ${SOURCEKITFW_INSTALL_IN_COMPONENT})
else()
set_output_directory(${name}
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/tools/complete-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ endif()

add_dependencies(tools complete-test)
swift_install_in_component(TARGETS complete-test
RUNTIME DESTINATION bin COMPONENT tools)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools)
2 changes: 1 addition & 1 deletion tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ endif()

add_dependencies(tools sourcekitd-repl)
swift_install_in_component(TARGETS sourcekitd-repl
RUNTIME DESTINATION bin COMPONENT tools)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools)
2 changes: 1 addition & 1 deletion tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ endif()

add_dependencies(tools sourcekitd-test)
swift_install_in_component(TARGETS sourcekitd-test
RUNTIME DESTINATION bin COMPONENT tools)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools)
2 changes: 1 addition & 1 deletion tools/libStaticMirror/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ add_dependencies(static-mirror-lib libStaticMirror)
swift_install_in_component(TARGETS libStaticMirror
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT static-mirror-lib
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}" COMPONENT static-mirror-lib
RUNTIME DESTINATION "bin" COMPONENT static-mirror-lib)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT static-mirror-lib)
swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/StaticMirror/"
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SCAN_LIB_NAME}"
COMPONENT static-mirror-lib)
4 changes: 2 additions & 2 deletions tools/libSwiftScan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
swift_install_in_component(TARGETS libSwiftScan
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)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT compiler)
else()
# On other platforms, instead install the library into 'lib/swift/host' and symlink to it from 'lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'
swift_install_in_component(TARGETS libSwiftScan
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host" COMPONENT compiler
RUNTIME DESTINATION "bin" COMPONENT compiler)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT compiler)

# Create a symlink to previously-used path of 'lib/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}'
# to the new location under 'lib/swift/host' for clients of the legacy path.
Expand Down