v29.4-roots.2 · Commit 1: [PATCH 01/21] build: port platform and dependency support
src/CMakeLists.txt
Before: src/CMakeLists.txt · After: src/CMakeLists.txt
File metadata
index 41577b2ad6ddfecc56c201fa630fe359ee4cb041..1ffedcf1a372a6a26c85789231f5df24dbfe4641 100644
Download original patch · Release notes
Diff rows 1–49 of 49. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.
src/CMakeLists.txt
CHANGED
|
@@ -15,10 +15,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
|
| 15 |
# These need to be included before CMAKE_*_OUTPUT_DIRECTORY variables
|
| 16 |
# are set, so output locations of subproject tests and libraries are
|
| 17 |
# not overridden.
|
|
|
|
| 18 |
include(../cmake/crc32c.cmake)
|
| 19 |
include(../cmake/leveldb.cmake)
|
| 20 |
-
include(../cmake/minisketch.cmake)
|
|
|
|
| 21 |
add_subdirectory(univalue)
|
|
|
|
|
|
|
| 22 |
#=============================
|
| 23 |
# secp256k1 subtree
|
| 24 |
#=============================
|
|
@@ -67,6 +71,7 @@ set_target_properties(secp256k1 PROPERTIES
|
|
| 67 |
EXCLUDE_FROM_ALL TRUE
|
| 68 |
)
|
| 69 |
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|
|
|
| 70 |
|
| 71 |
# Set top-level target output locations.
|
| 72 |
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
|
|
@@ -207,6 +212,7 @@ if(ENABLE_WALLET)
|
|
| 207 |
bitcoin_wallet
|
| 208 |
bitcoin_common
|
| 209 |
bitcoin_util
|
|
|
|
| 210 |
Boost::headers
|
| 211 |
)
|
| 212 |
install_binary_component(bitcoin-wallet HAS_MANPAGE)
|
|
@@ -266,7 +272,6 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
|
|
| 266 |
node/mempool_persist_args.cpp
|
| 267 |
node/miner.cpp
|
| 268 |
node/mini_miner.cpp
|
| 269 |
-
node/minisketchwrapper.cpp
|
| 270 |
node/peerman_args.cpp
|
| 271 |
node/psbt.cpp
|
| 272 |
node/timeoffsets.cpp
|
|
@@ -317,12 +322,12 @@ target_link_libraries(bitcoin_node
|
|
| 317 |
bitcoin_util
|
| 318 |
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
|
| 319 |
leveldb
|
| 320 |
-
minisketch
|
| 321 |
univalue
|
| 322 |
Boost::headers
|
| 323 |
$<TARGET_NAME_IF_EXISTS:libevent::core>
|
| 324 |
$<TARGET_NAME_IF_EXISTS:libevent::extra>
|
| 325 |
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
|
|
|
|
| 326 |
$<TARGET_NAME_IF_EXISTS:USDT::headers>
|
| 327 |
)
|
| 328 |
|
|
|
|
| 15 |
# These need to be included before CMAKE_*_OUTPUT_DIRECTORY variables
|
| 16 |
# are set, so output locations of subproject tests and libraries are
|
| 17 |
# not overridden.
|
| 18 |
+
if(NOT WITH_SYSTEM_LEVELDB)
|
| 19 |
include(../cmake/crc32c.cmake)
|
| 20 |
include(../cmake/leveldb.cmake)
|
| 21 |
+
endif() # WITH_SYSTEM_LEVELDB
|
| 22 |
+
|
| 23 |
add_subdirectory(univalue)
|
| 24 |
+
|
| 25 |
+
if(NOT WITH_SYSTEM_LIBSECP256K1)
|
| 26 |
#=============================
|
| 27 |
# secp256k1 subtree
|
| 28 |
#=============================
|
|
|
|
| 71 |
EXCLUDE_FROM_ALL TRUE
|
| 72 |
)
|
| 73 |
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
| 74 |
+
endif() # WITH_SYSTEM_LIBSECP256K1
|
| 75 |
|
| 76 |
# Set top-level target output locations.
|
| 77 |
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
|
|
|
|
| 212 |
bitcoin_wallet
|
| 213 |
bitcoin_common
|
| 214 |
bitcoin_util
|
| 215 |
+
univalue
|
| 216 |
Boost::headers
|
| 217 |
)
|
| 218 |
install_binary_component(bitcoin-wallet HAS_MANPAGE)
|
|
|
|
| 272 |
node/mempool_persist_args.cpp
|
| 273 |
node/miner.cpp
|
| 274 |
node/mini_miner.cpp
|
|
|
|
| 275 |
node/peerman_args.cpp
|
| 276 |
node/psbt.cpp
|
| 277 |
node/timeoffsets.cpp
|
|
|
|
| 322 |
bitcoin_util
|
| 323 |
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
|
| 324 |
leveldb
|
|
|
|
| 325 |
univalue
|
| 326 |
Boost::headers
|
| 327 |
$<TARGET_NAME_IF_EXISTS:libevent::core>
|
| 328 |
$<TARGET_NAME_IF_EXISTS:libevent::extra>
|
| 329 |
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
|
| 330 |
+
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
|
| 331 |
$<TARGET_NAME_IF_EXISTS:USDT::headers>
|
| 332 |
)
|
| 333 |
|