Skip to content

build: install the libdispatch dependencies into the right location #21831

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
Jan 23, 2019
Merged

build: install the libdispatch dependencies into the right location #21831

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
16 changes: 14 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,12 +977,24 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
add_dependencies(dispatch libdispatch-install)
add_dependencies(BlocksRuntime libdispatch-install)

if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
set(SOURCEKIT_RUNTIME_DIR bin)
else()
set(SOURCEKIT_RUNTIME_DIR lib)
endif()
swift_install_in_component(sourcekit-inproc
FILES
$<TARGET_FILE:dispatch>
$<TARGET_FILE:BlocksRuntime>
DESTINATION
lib${LLVM_LIBDIR_SUFFIX})
DESTINATION ${SOURCEKIT_RUNTIME_DIR})
if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
swift_install_in_component(sourcekit-inproc
FILES
$<TARGET_LINKER_FILE:dispatch>
$<TARGET_LINKER_FILE:BlocksRuntime>
DESTINATION lib)
endif()


# FIXME(compnerd) this should be taken care of by the
# INTERFACE_INCLUDE_DIRECTORIES above
Expand Down