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. The two line-number columns refer to before and after.
src/CMakeLists.txt
CHANGED
|
@@ -15,10 +15,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
15
15
|
# These need to be included before CMAKE_*_OUTPUT_DIRECTORY variables
|
|
16
16
|
# are set, so output locations of subproject tests and libraries are
|
|
17
17
|
# not overridden.
|
|
18
|
+
if(NOT WITH_SYSTEM_LEVELDB)
|
|
18
19
|
include(../cmake/crc32c.cmake)
|
|
19
20
|
include(../cmake/leveldb.cmake)
|
|
20
|
-
include(../cmake/minisketch.cmake)
|
|
21
|
+
endif() # WITH_SYSTEM_LEVELDB
|
|
22
|
+
|
|
21
23
|
add_subdirectory(univalue)
|
|
24
|
+
|
|
25
|
+
if(NOT WITH_SYSTEM_LIBSECP256K1)
|
|
22
26
|
#=============================
|
|
23
27
|
# secp256k1 subtree
|
|
24
28
|
#=============================
|
|
@@ -67,6 +71,7 @@ set_target_properties(secp256k1 PROPERTIES
|
|
|
67
71
|
EXCLUDE_FROM_ALL TRUE
|
|
68
72
|
)
|
|
69
73
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|
74
|
+
endif() # WITH_SYSTEM_LIBSECP256K1
|
|
70
75
|
|
|
71
76
|
# Set top-level target output locations.
|
|
72
77
|
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
|
|
@@ -207,6 +212,7 @@ if(ENABLE_WALLET)
|
|
|
207
212
|
bitcoin_wallet
|
|
208
213
|
bitcoin_common
|
|
209
214
|
bitcoin_util
|
|
215
|
+
univalue
|
|
210
216
|
Boost::headers
|
|
211
217
|
)
|
|
212
218
|
install_binary_component(bitcoin-wallet HAS_MANPAGE)
|
|
@@ -266,7 +272,6 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
|
|
|
266
272
|
node/mempool_persist_args.cpp
|
|
267
273
|
node/miner.cpp
|
|
268
274
|
node/mini_miner.cpp
|
|
269
|
-
node/minisketchwrapper.cpp
|
|
270
275
|
node/peerman_args.cpp
|
|
271
276
|
node/psbt.cpp
|
|
272
277
|
node/timeoffsets.cpp
|
|
@@ -317,12 +322,12 @@ target_link_libraries(bitcoin_node
|
|
|
317
322
|
bitcoin_util
|
|
318
323
|
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
|
|
319
324
|
leveldb
|
|
320
|
-
minisketch
|
|
321
325
|
univalue
|
|
322
326
|
Boost::headers
|
|
323
327
|
$<TARGET_NAME_IF_EXISTS:libevent::core>
|
|
324
328
|
$<TARGET_NAME_IF_EXISTS:libevent::extra>
|
|
325
329
|
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
|
|
330
|
+
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
|
|
326
331
|
$<TARGET_NAME_IF_EXISTS:USDT::headers>
|
|
327
332
|
)
|
|
328
333
|
|