Skip to content

Commit 56ca782

Browse files
committed
Fix #1023
- Add install targets to 3rdparty dependencies - Add cmake version config
1 parent 22929a2 commit 56ca782

File tree

7 files changed

+48
-6
lines changed

7 files changed

+48
-6
lines changed

3rdparty/cppzmq/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_library(cppzmq INTERFACE)
77

88
target_include_directories(cppzmq
99
INTERFACE
10-
${CMAKE_CURRENT_SOURCE_DIR}
10+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1111
)
1212

1313
if(TARGET libzmq-static)
@@ -17,3 +17,10 @@ elseif(TARGET libzmq)
1717
else()
1818
message(FATAL_ERROR "Unknown zeromq target name")
1919
endif()
20+
21+
install(TARGETS cppzmq
22+
EXPORT ${BTCPP_LIBRARY}Targets
23+
ARCHIVE DESTINATION ${BTCPP_LIB_DESTINATION}
24+
LIBRARY DESTINATION ${BTCPP_LIB_DESTINATION}
25+
RUNTIME DESTINATION ${BTCPP_BIN_DESTINATION}
26+
INCLUDES DESTINATION ${BTCPP_INCLUDE_DESTINATION})

3rdparty/flatbuffers/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@ add_library(flatbuffers::flatbuffers ALIAS flatbuffers)
44

55
target_include_directories(flatbuffers
66
INTERFACE
7-
${CMAKE_CURRENT_SOURCE_DIR}
7+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
88
)
9+
10+
install(TARGETS flatbuffers
11+
EXPORT ${BTCPP_LIBRARY}Targets
12+
ARCHIVE DESTINATION ${BTCPP_LIB_DESTINATION}
13+
LIBRARY DESTINATION ${BTCPP_LIB_DESTINATION}
14+
RUNTIME DESTINATION ${BTCPP_BIN_DESTINATION}
15+
INCLUDES DESTINATION ${BTCPP_INCLUDE_DESTINATION})

3rdparty/minicoro/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@ add_library(minicoro::minicoro ALIAS minicoro)
44

55
target_include_directories(minicoro
66
INTERFACE
7-
${CMAKE_CURRENT_SOURCE_DIR}
7+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
88
)
9+
10+
install(TARGETS minicoro
11+
EXPORT ${BTCPP_LIBRARY}Targets
12+
ARCHIVE DESTINATION ${BTCPP_LIB_DESTINATION}
13+
LIBRARY DESTINATION ${BTCPP_LIB_DESTINATION}
14+
RUNTIME DESTINATION ${BTCPP_BIN_DESTINATION}
15+
INCLUDES DESTINATION ${BTCPP_INCLUDE_DESTINATION})

3rdparty/minitrace/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_library(minitrace::minitrace ALIAS minitrace)
66

77
target_include_directories(minitrace
88
PUBLIC
9-
${CMAKE_CURRENT_SOURCE_DIR}
9+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1010
)
1111

1212
target_compile_definitions(minitrace
@@ -18,3 +18,10 @@ set_property(TARGET minitrace
1818
PROPERTY
1919
POSITION_INDEPENDENT_CODE ON
2020
)
21+
22+
install(TARGETS minitrace
23+
EXPORT ${BTCPP_LIBRARY}Targets
24+
ARCHIVE DESTINATION ${BTCPP_LIB_DESTINATION}
25+
LIBRARY DESTINATION ${BTCPP_LIB_DESTINATION}
26+
RUNTIME DESTINATION ${BTCPP_BIN_DESTINATION}
27+
INCLUDES DESTINATION ${BTCPP_INCLUDE_DESTINATION})

3rdparty/tinyxml2/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@ add_library(tinyxml2::tinyxml2 ALIAS tinyxml2)
66

77
target_include_directories(tinyxml2
88
PUBLIC
9-
${CMAKE_CURRENT_SOURCE_DIR}
9+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1010
)
1111

1212
set_property(TARGET tinyxml2
1313
PROPERTY
1414
POSITION_INDEPENDENT_CODE ON
1515
)
16+
17+
install(TARGETS tinyxml2
18+
EXPORT ${BTCPP_LIBRARY}Targets
19+
ARCHIVE DESTINATION ${BTCPP_LIB_DESTINATION}
20+
LIBRARY DESTINATION ${BTCPP_LIB_DESTINATION}
21+
RUNTIME DESTINATION ${BTCPP_BIN_DESTINATION}
22+
INCLUDES DESTINATION ${BTCPP_INCLUDE_DESTINATION})

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ target_link_libraries(${BTCPP_LIBRARY}
226226
PRIVATE
227227
Threads::Threads
228228
${CMAKE_DL_LIBS}
229-
foonathan::lexy
229+
$<BUILD_INTERFACE:foonathan::lexy>
230230
minitrace::minitrace
231231
tinyxml2::tinyxml2
232232
minicoro::minicoro

cmake/conan_build.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ macro(export_btcpp_package)
3131

3232
include(CMakePackageConfigHelpers)
3333

34+
write_basic_package_version_file(
35+
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
36+
VERSION ${PROJECT_VERSION}
37+
COMPATIBILITY SameMajorVersion
38+
)
39+
3440
configure_package_config_file(
3541
"${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in"
3642
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
@@ -40,6 +46,7 @@ macro(export_btcpp_package)
4046
install(
4147
FILES
4248
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
49+
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
4350
DESTINATION "${BTCPP_LIB_DESTINATION}/cmake/${PROJECT_NAME}"
4451
)
4552
endmacro()

0 commit comments

Comments
 (0)