From 7ce09a59921284247ac6c4de72c8a79b9c679485 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:02:11 +0000 Subject: [PATCH 1/2] cmake: Add `libbitcoinkernel` target This is a convenience target as a synonym for `bitcoinkernel`. --- src/kernel/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 9dae4b88111..7c2b9f64a69 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -132,6 +132,10 @@ endif() configure_file(${PROJECT_SOURCE_DIR}/libbitcoinkernel.pc.in ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc @ONLY) install(FILES ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT bitcoinkernel) +# Add a convenience libbitcoinkernel target as a synonym for bitcoinkernel. +add_custom_target(libbitcoinkernel) +add_dependencies(libbitcoinkernel bitcoinkernel) + install(TARGETS bitcoinkernel RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} From 3a914ab96bdeb70cdf848dd74deda5a80d0a7f78 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 14 Feb 2025 17:06:14 +0000 Subject: [PATCH 2/2] cmake: Rename `bitcoinkernel` component to `libbitcoinkernel` The new component name is more convenient for the library and aligns with the `libbitcoinkernel` target introduced in the previous commit. --- src/kernel/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index 7c2b9f64a69..f0a1128a6e4 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -123,14 +123,14 @@ if(NOT BUILD_SHARED_LIBS) set(all_kernel_static_link_libs "") get_target_static_link_libs(bitcoinkernel all_kernel_static_link_libs) - install(TARGETS ${all_kernel_static_link_libs} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT bitcoinkernel) + install(TARGETS ${all_kernel_static_link_libs} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libbitcoinkernel) list(TRANSFORM all_kernel_static_link_libs PREPEND "-l") # LIBS_PRIVATE is substituted in the pkg-config file. list(JOIN all_kernel_static_link_libs " " LIBS_PRIVATE) endif() configure_file(${PROJECT_SOURCE_DIR}/libbitcoinkernel.pc.in ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc @ONLY) -install(FILES ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT bitcoinkernel) +install(FILES ${PROJECT_BINARY_DIR}/libbitcoinkernel.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" COMPONENT libbitcoinkernel) # Add a convenience libbitcoinkernel target as a synonym for bitcoinkernel. add_custom_target(libbitcoinkernel) @@ -139,11 +139,11 @@ add_dependencies(libbitcoinkernel bitcoinkernel) install(TARGETS bitcoinkernel RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT bitcoinkernel + COMPONENT libbitcoinkernel LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT bitcoinkernel + COMPONENT libbitcoinkernel ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT bitcoinkernel + COMPONENT libbitcoinkernel )