fixup! cmake: Build bench_bitcoin executable

1) Drop unneeded dependencies in `test_util`. 2) Adjust dependencies for `bench_bitcoin` (removed uneeded ones and add `bitcoin_node`, required after step (1).
hebasto · Nov 9, 2023 · ab9853a · ab9853a
1 parent 9a0a914
commit ab9853a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Copyright (c) 2023 The Bitcoin Core developers
+# Copyright (c) 2023-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or https://opensource.org/license/mit/.
 
 include(GenerateHeaders)
 generate_header_from_raw(data/block413567.raw)
@@ -52,8 +52,7 @@ add_executable(bench_bitcoin
 target_link_libraries(bench_bitcoin
   core
   test_util
-  leveldb
-  univalue
+  bitcoin_node
   Boost::headers
 )
 

diff --git a/src/test/util/CMakeLists.txt b/src/test/util/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Copyright (c) 2023 The Bitcoin Core developers
+# Copyright (c) 2023-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+# file COPYING or https://opensource.org/license/mit/.
 
 add_library(test_util STATIC EXCLUDE_FROM_ALL
   blockfilter.cpp
@@ -17,22 +17,13 @@ add_library(test_util STATIC EXCLUDE_FROM_ALL
   transaction_utils.cpp
   txmempool.cpp
   validation.cpp
+  $<$<BOOL:${ENABLE_WALLET}>:${PROJECT_SOURCE_DIR}/src/wallet/test/util.cpp>
 )
+
 target_link_libraries(test_util
   PRIVATE
     core
-    bitcoin_common
-    bitcoin_node
-    leveldb
-    univalue
     Boost::headers
+  PUBLIC
+    univalue
 )
-
-if(ENABLE_WALLET)
-  target_sources(test_util
-    PRIVATE
-      ../../wallet/test/util.cpp
-  )
-endif()
-
-target_link_libraries(test_util PRIVATE core)