cmake: Add add_executable_append_flags function

hebasto · Apr 26, 2024 · 555798a · 555798a
1 parent 9016c6d
commit 555798a
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 100 deletions.
diff --git a/cmake/module/AddTargetMacros.cmake b/cmake/module/AddTargetMacros.cmake
@@ -32,3 +32,10 @@ function(add_library_append_flags name)
   endif()
   target_append_flags_interface("${name}")
 endfunction()
+
+function(add_executable_append_flags name)
+  cmake_parse_arguments(PARSE_ARGV 1 FWD "" "" "")
+  add_executable("${name}" ${FWD_UNPARSED_ARGUMENTS})
+  target_link_libraries("${name}" PRIVATE core_interface)
+  target_append_flags_interface("${name}")
+endfunction()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -125,18 +125,18 @@ if(ENABLE_WALLET)
   add_subdirectory(wallet)
 
   if(BUILD_WALLET_TOOL)
-    add_executable(bitcoin-wallet
+    add_executable_append_flags(bitcoin-wallet
       bitcoin-wallet.cpp
       init/bitcoin-wallet.cpp
       wallet/wallettool.cpp
     )
     add_windows_resources(bitcoin-wallet bitcoin-wallet-res.rc)
     target_link_libraries(bitcoin-wallet
-      core_interface
-      bitcoin_wallet
-      bitcoin_common
-      bitcoin_util
-      Boost::headers
+      PRIVATE
+        bitcoin_wallet
+        bitcoin_common
+        bitcoin_util
+        Boost::headers
     )
     list(APPEND installable_targets bitcoin-wallet)
   endif()
@@ -256,28 +256,28 @@ target_link_libraries(bitcoin_node
 
 # Bitcoin Core bitcoind.
 if(BUILD_DAEMON)
-  add_executable(bitcoind
+  add_executable_append_flags(bitcoind
     bitcoind.cpp
     init/bitcoind.cpp
   )
   add_windows_resources(bitcoind bitcoind-res.rc)
   target_link_libraries(bitcoind
-    core_interface
-    bitcoin_node
-    $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
+    PRIVATE
+      bitcoin_node
+      $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
   )
   list(APPEND installable_targets bitcoind)
 endif()
 if(MULTIPROCESS)
-  add_executable(bitcoin-node
+  add_executable_append_flags(bitcoin-node
     bitcoind.cpp
     init/bitcoin-node.cpp
   )
   target_link_libraries(bitcoin-node
-    core_interface
-    bitcoin_node
-    bitcoin_ipc
-    $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
+    PRIVATE
+      bitcoin_node
+      bitcoin_ipc
+      $<TARGET_NAME_IF_EXISTS:bitcoin_wallet>
   )
   list(APPEND installable_targets bitcoin-node)
 endif()
@@ -295,39 +295,39 @@ target_link_libraries(bitcoin_cli
 
 # Bitcoin Core RPC client
 if(BUILD_CLI)
-  add_executable(bitcoin-cli bitcoin-cli.cpp)
+  add_executable_append_flags(bitcoin-cli bitcoin-cli.cpp)
   add_windows_resources(bitcoin-cli bitcoin-cli-res.rc)
   target_link_libraries(bitcoin-cli
-    core_interface
-    bitcoin_cli
-    bitcoin_common
-    bitcoin_util
-    libevent::libevent
+    PRIVATE
+      bitcoin_cli
+      bitcoin_common
+      bitcoin_util
+      libevent::libevent
   )
   list(APPEND installable_targets bitcoin-cli)
 endif()
 
 
 if(BUILD_TX)
-  add_executable(bitcoin-tx bitcoin-tx.cpp)
+  add_executable_append_flags(bitcoin-tx bitcoin-tx.cpp)
   add_windows_resources(bitcoin-tx bitcoin-tx-res.rc)
   target_link_libraries(bitcoin-tx
-    core_interface
-    bitcoin_common
-    bitcoin_util
-    univalue
+    PRIVATE
+      bitcoin_common
+      bitcoin_util
+      univalue
   )
   list(APPEND installable_targets bitcoin-tx)
 endif()
 
 
 if(BUILD_UTIL)
-  add_executable(bitcoin-util bitcoin-util.cpp)
+  add_executable_append_flags(bitcoin-util bitcoin-util.cpp)
   add_windows_resources(bitcoin-util bitcoin-util-res.rc)
   target_link_libraries(bitcoin-util
-    core_interface
-    bitcoin_common
-    bitcoin_util
+    PRIVATE
+      bitcoin_common
+      bitcoin_util
   )
   list(APPEND installable_targets bitcoin-util)
 endif()
@@ -343,14 +343,8 @@ if(BUILD_KERNEL_LIB)
 endif()
 
 if(BUILD_UTIL_CHAINSTATE)
-  add_executable(bitcoin-chainstate
-    bitcoin-chainstate.cpp
-  )
-  target_link_libraries(bitcoin-chainstate
-    PRIVATE
-      core_interface
-      bitcoinkernel
-  )
+  add_executable_append_flags(bitcoin-chainstate bitcoin-chainstate.cpp)
+  target_link_libraries(bitcoin-chainstate PRIVATE bitcoinkernel)
 endif()
 
 

diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
@@ -5,7 +5,7 @@
 include(GenerateHeaders)
 generate_header_from_raw(data/block413567.raw)
 
-add_executable(bench_bitcoin
+add_executable_append_flags(bench_bitcoin
   bench_bitcoin.cpp
   bench.cpp
   data.cpp
@@ -53,10 +53,10 @@ add_executable(bench_bitcoin
 )
 
 target_link_libraries(bench_bitcoin
-  core_interface
-  test_util
-  bitcoin_node
-  Boost::headers
+  PRIVATE
+    test_util
+    bitcoin_node
+    Boost::headers
 )
 
 if(ENABLE_WALLET)
@@ -69,7 +69,7 @@ if(ENABLE_WALLET)
       wallet_loading.cpp
       wallet_ismine.cpp
   )
-  target_link_libraries(bench_bitcoin bitcoin_wallet)
+  target_link_libraries(bench_bitcoin PRIVATE bitcoin_wallet)
 endif()
 
 install(TARGETS bench_bitcoin

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -187,41 +187,35 @@ if(QT_IS_STATIC)
   )
 endif()
 
-add_executable(bitcoin-qt
+add_executable_append_flags(bitcoin-qt WIN32
   main.cpp
   ../init/bitcoin-qt.cpp
 )
 
 add_windows_resources(bitcoin-qt res/bitcoin-qt-res.rc)
 
 target_link_libraries(bitcoin-qt
-  core_interface
-  bitcoinqt
-  bitcoin_node
+  PRIVATE
+    bitcoinqt
+    bitcoin_node
 )
 
 import_plugins(bitcoin-qt)
 set(installable_targets bitcoin-qt)
-if(WIN32)
-  set_target_properties(bitcoin-qt PROPERTIES WIN32_EXECUTABLE TRUE)
-endif()
 
 if(MULTIPROCESS)
-  add_executable(bitcoin-gui
+  add_executable_append_flags(bitcoin-gui WIN32
     main.cpp
     ../init/bitcoin-gui.cpp
   )
   target_link_libraries(bitcoin-gui
-    core_interface
-    bitcoinqt
-    bitcoin_node
-    bitcoin_ipc
+    PRIVATE
+      bitcoinqt
+      bitcoin_node
+      bitcoin_ipc
   )
   import_plugins(bitcoin-gui)
   list(APPEND installable_targets bitcoin-gui)
-  if(WIN32)
-    set_target_properties(bitcoin-gui PROPERTIES WIN32_EXECUTABLE TRUE)
-  endif()
 endif()
 
 install(TARGETS ${installable_targets}

diff --git a/src/qt/test/CMakeLists.txt b/src/qt/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit/.
 
-add_executable(test_bitcoin-qt
+add_executable_append_flags(test_bitcoin-qt
   apptests.cpp
   optiontests.cpp
   rpcnestedtests.cpp
@@ -13,12 +13,12 @@ add_executable(test_bitcoin-qt
 )
 
 target_link_libraries(test_bitcoin-qt
-  core_interface
-  bitcoinqt
-  test_util
-  bitcoin_node
-  Boost::headers
-  Qt5::Test
+  PRIVATE
+    bitcoinqt
+    test_util
+    bitcoin_node
+    Boost::headers
+    Qt5::Test
 )
 
 import_plugins(test_bitcoin-qt)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -14,7 +14,7 @@ generate_header_from_json(data/tx_invalid.json)
 generate_header_from_json(data/tx_valid.json)
 generate_header_from_raw(data/asmap.raw)
 
-add_executable(test_bitcoin
+add_executable_append_flags(test_bitcoin
   main.cpp
   $<TARGET_OBJECTS:bitcoin_consensus>
   ${CMAKE_CURRENT_BINARY_DIR}/data/asmap.raw.h
@@ -140,13 +140,13 @@ add_executable(test_bitcoin
 )
 
 target_link_libraries(test_bitcoin
-  core_interface
-  test_util
-  bitcoin_cli
-  bitcoin_node
-  minisketch
-  Boost::headers
-  libevent::libevent
+  PRIVATE
+    test_util
+    bitcoin_cli
+    bitcoin_node
+    minisketch
+    Boost::headers
+    libevent::libevent
 )
 
 if(ENABLE_WALLET)
@@ -170,10 +170,10 @@ if(ENABLE_WALLET)
       ../wallet/test/walletdb_tests.cpp
       ../wallet/test/walletload_tests.cpp
   )
-  target_link_libraries(test_bitcoin bitcoin_wallet)
   if(USE_BDB)
     target_sources(test_bitcoin PRIVATE ../wallet/test/db_tests.cpp)
   endif()
+  target_link_libraries(test_bitcoin PRIVATE bitcoin_wallet)
 endif()
 
 if(MULTIPROCESS)
@@ -191,7 +191,7 @@ if(MULTIPROCESS)
     PRIVATE
       ipc_tests.cpp
   )
-  target_link_libraries(test_bitcoin bitcoin_ipc_test)
+  target_link_libraries(test_bitcoin PRIVATE bitcoin_ipc_test)
 endif()
 
 install(TARGETS test_bitcoin

diff --git a/src/test/fuzz/CMakeLists.txt b/src/test/fuzz/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 add_subdirectory(util)
 
-add_executable(fuzz
+add_executable_append_flags(fuzz
   addition_overflow.cpp
   addrman.cpp
   asmap.cpp
@@ -121,16 +121,16 @@ add_executable(fuzz
   versionbits.cpp
 )
 target_link_libraries(fuzz
-  core_interface
-  test_fuzz
-  bitcoin_cli
-  bitcoin_common
-  minisketch
-  leveldb
-  univalue
-  secp256k1
-  Boost::headers
-  libevent::libevent
+  PRIVATE
+    test_fuzz
+    bitcoin_cli
+    bitcoin_common
+    minisketch
+    leveldb
+    univalue
+    secp256k1
+    Boost::headers
+    libevent::libevent
 )
 
 if(ENABLE_WALLET)
@@ -143,5 +143,5 @@ if(ENABLE_WALLET)
       $<$<BOOL:${USE_SQLITE}>:${PROJECT_SOURCE_DIR}/src/wallet/test/fuzz/notifications.cpp>
       $<$<BOOL:${USE_SQLITE}>:${PROJECT_SOURCE_DIR}/src/wallet/test/fuzz/scriptpubkeyman.cpp>
   )
-  target_link_libraries(fuzz bitcoin_wallet)
+  target_link_libraries(fuzz PRIVATE bitcoin_wallet)
 endif()
diff --git a/src/univalue/CMakeLists.txt b/src/univalue/CMakeLists.txt
@@ -14,21 +14,13 @@ target_include_directories(univalue
 )
 
 if(BUILD_TESTS)
-  add_executable(unitester test/unitester.cpp)
+  add_executable_append_flags(unitester test/unitester.cpp)
   target_compile_definitions(unitester
     PRIVATE
       JSON_TEST_SRC=\"${CMAKE_CURRENT_SOURCE_DIR}/test\"
   )
-  target_link_libraries(unitester
-    PRIVATE
-      core_interface
-      univalue
-  )
+  target_link_libraries(unitester PRIVATE univalue)
 
-  add_executable(object test/object.cpp)
-  target_link_libraries(object
-    PRIVATE
-      core_interface
-      univalue
-  )
+  add_executable_append_flags(object test/object.cpp)
+  target_link_libraries(object PRIVATE univalue)
 endif()