File tree Expand file tree Collapse file tree 4 files changed +31
-7
lines changed Expand file tree Collapse file tree 4 files changed +31
-7
lines changed Original file line number Diff line number Diff line change 11
22set (DISPATCH_EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR} /dispatchExports.cmake)
33configure_file (dispatchConfig.cmake.in
4- ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake)
4+ ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake
5+ @ONLY)
6+
7+ if (LibRT_FOUND)
8+ file (COPY FindLibRT.cmake DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
9+ endif ()
510
611get_property (DISPATCH_EXPORTS GLOBAL PROPERTY DISPATCH_EXPORTS)
712export (TARGETS ${DISPATCH_EXPORTS} FILE ${DISPATCH_EXPORTS_FILE} )
13+
14+ if (NOT ENABLE_SWIFT)
15+ install (EXPORT dispatchExports DESTINATION ${INSTALL_TARGET_DIR} /cmake/dispatch)
16+ install (FILES ${CMAKE_CURRENT_BINARY_DIR} /dispatchConfig.cmake
17+ DESTINATION ${INSTALL_TARGET_DIR} /cmake/dispatch)
18+
19+ if (LibRT_FOUND)
20+ install (FILES ${CMAKE_CURRENT_BINARY_DIR} /FindLibRT.cmake
21+ DESTINATION ${INSTALL_TARGET_DIR} /cmake/dispatch)
22+ endif ()
23+ 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+
4+ if (@LibRT_FOUND@)
5+ find_dependency(LibRT)
6+ endif ()
17
28set (DISPATCH_HAS_SWIFT_SDK_OVERLAY @ENABLE_SWIFT@)
39
410if (NOT TARGET dispatch)
5- include (@DISPATCH_EXPORTS_FILE@ )
11+ include (" ${CMAKE_CURRENT_LIST_DIR} /dispatchExports.cmake" )
612endif ()
713
Original file line number Diff line number Diff line change @@ -13,7 +13,8 @@ if(WIN32)
1313endif ()
1414
1515target_include_directories (BlocksRuntime PUBLIC
16- ${CMAKE_CURRENT_SOURCE_DIR} )
16+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} >
17+ $<INSTALL_INTERFACE:${INSTALL_BLOCK_HEADERS_DIR} >)
1718if (HAVE_OBJC AND CMAKE_DL_LIBS )
1819 target_link_libraries (BlocksRuntime PUBLIC
1920 ${CMAKE_DL_LIBS} )
Original file line number Diff line number Diff line change @@ -89,10 +89,11 @@ if(HAVE_OBJC)
8989endif ()
9090
9191target_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} /..>)
9697target_include_directories (dispatch PRIVATE
9798 ${PROJECT_SOURCE_DIR} /private )
9899
You can’t perform that action at this time.
0 commit comments