Skip to content

install: place the libraries in architecture-specific directories on ELF platforms #780

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 1 commit into from
Closed

install: place the libraries in architecture-specific directories on ELF platforms #780

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
4 changes: 4 additions & 0 deletions src/BlocksRuntime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ if(INSTALL_PRIVATE_HEADERS)
DESTINATION ${INSTALL_BLOCK_HEADERS_DIR})
endif()
set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS BlocksRuntime)
if(ENABLE_SWIFT AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
get_swift_host_arch(swift_arch)
set(INSTALL_TARGET_DIR "${INSTALL_TARGET_DIR}/${swift_arch}")
endif()
install(TARGETS BlocksRuntime
EXPORT dispatchExports
ARCHIVE DESTINATION ${INSTALL_TARGET_DIR}
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ if(ENABLE_SWIFT)
add_subdirectory(swift)
endif()

if(ENABLE_SWIFT AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
get_swift_host_arch(swift_arch)
set(INSTALL_TARGET_DIR "${INSTALL_TARGET_DIR}/${swift_arch}")
endif()
set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS dispatch)
install(TARGETS dispatch
EXPORT dispatchExports
Expand Down
3 changes: 3 additions & 0 deletions src/swift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc
DESTINATION ${INSTALL_TARGET_DIR}/${swift_arch})
set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS swiftDispatch)
if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
set(INSTALL_TARGET_DIR "${INSTALL_TARGET_DIR}/${swift_arch}")
endif()
install(TARGETS swiftDispatch
EXPORT dispatchExports
ARCHIVE DESTINATION ${INSTALL_TARGET_DIR}
Expand Down