Skip to content

Fix the install path for the toolchain #314

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 1 commit into from
Oct 19, 2017
Merged

Fix the install path for the toolchain #314

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: 2 additions & 2 deletions dispatch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ install(FILES
source.h
time.h
DESTINATION
${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
if(ENABLE_SWIFT)
get_filename_component(MODULE_MAP module.modulemap REALPATH)
install(FILES
${MODULE_MAP}
DESTINATION
${CMAKE_INSTALL_FULL_INCLUDEDIR}/dispatch)
"${CMAKE_INSTALL_LIBDIR}/swift/dispatch")
endif()

2 changes: 1 addition & 1 deletion os/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ install(FILES
object.h
linux_base.h
DESTINATION
"${CMAKE_INSTALL_FULL_INCLUDEDIR}/os")
"${CMAKE_INSTALL_LIBDIR}/swift/os")

2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ add_custom_command(TARGET dispatch POST_BUILD
install(TARGETS
dispatch
DESTINATION
"${CMAKE_INSTALL_LIBDIR}")
"${CMAKE_INSTALL_LIBDIR}/swift/${SWIFT_OS}")
if(ENABLE_SWIFT)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule
Expand Down