From 3b42e05aa9e38ba00d52b2338375b4caf032f041 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Tue, 18 Feb 2025 12:30:41 +0000 Subject: [PATCH] cmake: Make implicit `libbitcoinkernel` dependencies explicit This change fixes a regression introduced by enabling the `OPTIMIZE_DEPENDENCIES` property. --- src/kernel/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt index f0a1128a6e44f..b9f37969d3741 100644 --- a/src/kernel/CMakeLists.txt +++ b/src/kernel/CMakeLists.txt @@ -102,6 +102,10 @@ set_target_properties(bitcoinkernel PROPERTIES CXX_VISIBILITY_PRESET default ) +# Add a convenience libbitcoinkernel target as a synonym for bitcoinkernel. +add_custom_target(libbitcoinkernel) +add_dependencies(libbitcoinkernel bitcoinkernel) + # When building the static library, install all static libraries the # bitcoinkernel depends on. if(NOT BUILD_SHARED_LIBS) @@ -110,6 +114,7 @@ if(NOT BUILD_SHARED_LIBS) get_target_property(linked_libraries ${target} LINK_LIBRARIES) foreach(dep ${linked_libraries}) if(TARGET ${dep}) + add_dependencies(libbitcoinkernel ${dep}) get_target_property(dep_type ${dep} TYPE) if(dep_type STREQUAL "STATIC_LIBRARY") list(APPEND ${libs_out} ${dep}) @@ -132,10 +137,6 @@ 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 libbitcoinkernel) -# 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}