Skip to content

Commit 9da0820

Browse files
committed
Merge bitcoin#31869: cmake: Add libbitcoinkernel target
3a914ab cmake: Rename `bitcoinkernel` component to `libbitcoinkernel` (Hennadii Stepanov) 7ce09a5 cmake: Add `libbitcoinkernel` target (Hennadii Stepanov) Pull request description: This PR amends bitcoin#31844 by: 1. Adding a convenience `libbitcoinkernel` target as a synonym for `bitcoinkernel`. 2. Renaming the `bitcoinkernel` component to `libbitcoinkernel`, as initially intended in bitcoin#31844 Here is an example of usage: ```sh cmake -B build -DBUILD_UTIL_CHAINSTATE=ON cmake --build build --target libbitcoinkernel cmake --install build --component libbitcoinkernel ``` ACKs for top commit: s373nZ: ACK bitcoin@3a914ab theuni: ACK 3a914ab TheCharlatan: ACK 3a914ab BrandonOdiwuor: Tested ACK 3a914ab Tree-SHA512: 3576ce6261413ba803711a4448ab8da8a5ad161189ab22be51d40f85b3847547060f537f37cc2d6062c193258f1c61f25df21a1e73cf86336f37705cdfd16d7e
2 parents db36a92 + 3a914ab commit 9da0820

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/kernel/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,23 +123,27 @@ if(NOT BUILD_SHARED_LIBS)
123123
set(all_kernel_static_link_libs "")
124124
get_target_static_link_libs(bitcoinkernel all_kernel_static_link_libs)
125125

126-
install(TARGETS ${all_kernel_static_link_libs} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT bitcoinkernel)
126+
install(TARGETS ${all_kernel_static_link_libs} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libbitcoinkernel)
127127
list(TRANSFORM all_kernel_static_link_libs PREPEND "-l")
128128
# LIBS_PRIVATE is substituted in the pkg-config file.
129129
list(JOIN all_kernel_static_link_libs " " LIBS_PRIVATE)
130130
endif()
131131

132132
configure_file(${PROJECT_SOURCE_DIR}/libbitcoinkernel.pc.in ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc @ONLY)
133-
install(FILES ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT bitcoinkernel)
133+
install(FILES ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT libbitcoinkernel)
134+
135+
# Add a convenience libbitcoinkernel target as a synonym for bitcoinkernel.
136+
add_custom_target(libbitcoinkernel)
137+
add_dependencies(libbitcoinkernel bitcoinkernel)
134138

135139
install(TARGETS bitcoinkernel
136140
RUNTIME
137141
DESTINATION ${CMAKE_INSTALL_BINDIR}
138-
COMPONENT bitcoinkernel
142+
COMPONENT libbitcoinkernel
139143
LIBRARY
140144
DESTINATION ${CMAKE_INSTALL_LIBDIR}
141-
COMPONENT bitcoinkernel
145+
COMPONENT libbitcoinkernel
142146
ARCHIVE
143147
DESTINATION ${CMAKE_INSTALL_LIBDIR}
144-
COMPONENT bitcoinkernel
148+
COMPONENT libbitcoinkernel
145149
)

0 commit comments

Comments
 (0)