File tree 4 files changed +22
-7
lines changed
4 files changed +22
-7
lines changed Original file line number Diff line number Diff line change 1
1
2
2
set (DISPATCH_EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR} /dispatchExports.cmake)
3
3
configure_file (dispatchConfig.cmake.in
4
- ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake)
4
+ ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake
5
+ @ONLY)
6
+ file (COPY FindLibRT.cmake DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
5
7
6
8
get_property (DISPATCH_EXPORTS GLOBAL PROPERTY DISPATCH_EXPORTS)
7
9
export (TARGETS ${DISPATCH_EXPORTS} FILE ${DISPATCH_EXPORTS_FILE} )
10
+
11
+ if (NOT ENABLE_SWIFT)
12
+ install (EXPORT dispatchExports DESTINATION ${INSTALL_TARGET_DIR} /cmake/dispatch)
13
+ install (FILES
14
+ ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake
15
+ ${CMAKE_CURRENT_BINARY_DIR} /FindLibRT.cmake
16
+ DESTINATION ${INSTALL_TARGET_DIR} /cmake/dispatch)
17
+ endif ()
Original file line number Diff line number Diff line change
1
+ include (CMakeFindDependencyMacro)
2
+ list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR} " )
3
+ find_dependency(LibRT)
1
4
2
5
set (DISPATCH_HAS_SWIFT_SDK_OVERLAY @ENABLE_SWIFT@)
3
6
4
7
if (NOT TARGET dispatch)
5
- include (@DISPATCH_EXPORTS_FILE@ )
8
+ include (" ${CMAKE_CURRENT_LIST_DIR} /dispatchExports.cmake" )
6
9
endif ()
7
10
Original file line number Diff line number Diff line change @@ -13,7 +13,8 @@ if(WIN32)
13
13
endif ()
14
14
15
15
target_include_directories (BlocksRuntime PUBLIC
16
- ${CMAKE_CURRENT_SOURCE_DIR} )
16
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} >
17
+ $<INSTALL_INTERFACE:${INSTALL_BLOCK_HEADERS_DIR} >)
17
18
if (HAVE_OBJC AND CMAKE_DL_LIBS )
18
19
target_link_libraries (BlocksRuntime PUBLIC
19
20
${CMAKE_DL_LIBS} )
Original file line number Diff line number Diff line change @@ -89,10 +89,11 @@ if(HAVE_OBJC)
89
89
endif ()
90
90
91
91
target_include_directories (dispatch PUBLIC
92
- ${PROJECT_BINARY_DIR}
93
- ${PROJECT_SOURCE_DIR}
94
- ${CMAKE_CURRENT_SOURCE_DIR}
95
- ${CMAKE_CURRENT_BINARY_DIR} )
92
+ $<BUILD_INTERFACE:${PROJECT_BINARY_DIR} >
93
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} >
94
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} >
95
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR} >
96
+ $<INSTALL_INTERFACE:${INSTALL_DISPATCH_HEADERS_DIR} /..>)
96
97
target_include_directories (dispatch PRIVATE
97
98
${PROJECT_SOURCE_DIR} /private )
98
99
You can’t perform that action at this time.
0 commit comments