From 98ceebe6e8e98be2d396aa8a36e37fb39a8adacd Mon Sep 17 00:00:00 2001 From: Ben Langmuir Date: Tue, 16 Oct 2018 15:55:50 -0700 Subject: [PATCH] Add dependency on the libdispatch-install step Libraries in sourcekitd depending on the external libdispatch project appear to only depend on the *build* step, but really need the install to happen as well since we are linking to the installed location. --- tools/SourceKit/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/SourceKit/CMakeLists.txt b/tools/SourceKit/CMakeLists.txt index e593133d6e32e..067643e3c0eaa 100644 --- a/tools/SourceKit/CMakeLists.txt +++ b/tools/SourceKit/CMakeLists.txt @@ -134,6 +134,8 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") # ensure that we strip out the DESTDIR environment # from the sub-build ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --target install + STEP_TARGETS + install BUILD_BYPRODUCTS /lib/${CMAKE_SHARED_LIBRARY_PREFIX}dispatch${CMAKE_SHARED_LIBRARY_SUFFIX} /lib/${CMAKE_IMPORT_LIBRARY_PREFIX}dispatch${CMAKE_IMPORT_LIBRARY_SUFFIX} @@ -169,6 +171,9 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") INTERFACE_INCLUDE_DIRECTORIES ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}/src/BlocksRuntime) + add_dependencies(dispatch libdispatch-install) + add_dependencies(BlocksRuntime libdispatch-install) + swift_install_in_component(sourcekit-inproc FILES $