Skip to content

build: install cmake config #871

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: install cmake config #871

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
18 changes: 17 additions & 1 deletion cmake/modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@

set(DISPATCH_EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/dispatchExports.cmake)
configure_file(dispatchConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/dispatchConfig.cmake)
${CMAKE_CURRENT_BINARY_DIR}/dispatchConfig.cmake
@ONLY)

if(LibRT_FOUND)
file(COPY FindLibRT.cmake DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
endif()

get_property(DISPATCH_EXPORTS GLOBAL PROPERTY DISPATCH_EXPORTS)
export(TARGETS ${DISPATCH_EXPORTS} FILE ${DISPATCH_EXPORTS_FILE})

if(NOT ENABLE_SWIFT)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the NOT ENABLE_SWIFT condition for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've adapted only the native library part. I don't have swift, I use dispatch as a native library in a C++ project and a cmake config for it would make consumption way easier.

install(EXPORT dispatchExports DESTINATION ${INSTALL_TARGET_DIR}/cmake/dispatch)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dispatchConfig.cmake
DESTINATION ${INSTALL_TARGET_DIR}/cmake/dispatch)

if(LibRT_FOUND)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindLibRT.cmake
DESTINATION ${INSTALL_TARGET_DIR}/cmake/dispatch)
endif()
endif()
8 changes: 7 additions & 1 deletion cmake/modules/dispatchConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
include(CMakeFindDependencyMacro)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")

if(@LibRT_FOUND@)
find_dependency(LibRT)
endif()

set(DISPATCH_HAS_SWIFT_SDK_OVERLAY @ENABLE_SWIFT@)

if(NOT TARGET dispatch)
include(@DISPATCH_EXPORTS_FILE@)
include("${CMAKE_CURRENT_LIST_DIR}/dispatchExports.cmake")
endif()

3 changes: 2 additions & 1 deletion src/BlocksRuntime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ if(WIN32)
endif()

target_include_directories(BlocksRuntime PUBLIC
${CMAKE_CURRENT_SOURCE_DIR})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INSTALL_BLOCK_HEADERS_DIR}>)
if(HAVE_OBJC AND CMAKE_DL_LIBS)
target_link_libraries(BlocksRuntime PUBLIC
${CMAKE_DL_LIBS})
Expand Down
9 changes: 5 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ if(HAVE_OBJC)
endif()

target_include_directories(dispatch PUBLIC
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:${INSTALL_DISPATCH_HEADERS_DIR}/..>)
target_include_directories(dispatch PRIVATE
${PROJECT_SOURCE_DIR}/private)

Expand Down