v30.3-roots.1 · Commit 1: [PATCH 01/68] build: adapt Roots platform support to Core 30.3
src/CMakeLists.txt
Before: src/CMakeLists.txt · After: src/CMakeLists.txt
File metadata
index f9934bb59060652d49eddabfab955a0c254daeac..1f9005a5ac1da90203582ff46c9ee318ef945d62 100644
Download original patch · Release notes
Diff rows 1–37 of 37. 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,16 +15,21 @@ 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 |
if (ENABLE_IPC AND NOT WITH_EXTERNAL_LIBMULTIPROCESS)
|
| 23 |
include(../cmake/libmultiprocess.cmake)
|
| 24 |
add_libmultiprocess(ipc/libmultiprocess)
|
| 25 |
endif()
|
| 26 |
-
include(../cmake/secp256k1.cmake)
|
| 27 |
-
add_secp256k1(secp256k1)
|
|
|
|
|
|
|
| 28 |
|
| 29 |
# Set top-level target output locations.
|
| 30 |
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
|
|
@@ -167,6 +172,7 @@ if(ENABLE_WALLET)
|
|
| 167 |
bitcoin_wallet
|
| 168 |
bitcoin_common
|
| 169 |
bitcoin_util
|
|
|
|
| 170 |
Boost::headers
|
| 171 |
)
|
| 172 |
install_binary_component(bitcoin-wallet HAS_MANPAGE)
|
|
@@ -284,6 +290,7 @@ target_link_libraries(bitcoin_node
|
|
| 284 |
$<TARGET_NAME_IF_EXISTS:libevent::core>
|
| 285 |
$<TARGET_NAME_IF_EXISTS:libevent::extra>
|
| 286 |
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
|
|
|
|
| 287 |
$<TARGET_NAME_IF_EXISTS:USDT::headers>
|
| 288 |
)
|
| 289 |
|
|
|
|
| 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 |
include(../cmake/minisketch.cmake)
|
| 23 |
+
|
| 24 |
add_subdirectory(univalue)
|
| 25 |
if (ENABLE_IPC AND NOT WITH_EXTERNAL_LIBMULTIPROCESS)
|
| 26 |
include(../cmake/libmultiprocess.cmake)
|
| 27 |
add_libmultiprocess(ipc/libmultiprocess)
|
| 28 |
endif()
|
| 29 |
+
if(NOT WITH_SYSTEM_LIBSECP256K1)
|
| 30 |
+
include(../cmake/secp256k1.cmake)
|
| 31 |
+
add_secp256k1(secp256k1)
|
| 32 |
+
endif()
|
| 33 |
|
| 34 |
# Set top-level target output locations.
|
| 35 |
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
|
|
|
|
| 172 |
bitcoin_wallet
|
| 173 |
bitcoin_common
|
| 174 |
bitcoin_util
|
| 175 |
+
univalue
|
| 176 |
Boost::headers
|
| 177 |
)
|
| 178 |
install_binary_component(bitcoin-wallet HAS_MANPAGE)
|
|
|
|
| 290 |
$<TARGET_NAME_IF_EXISTS:libevent::core>
|
| 291 |
$<TARGET_NAME_IF_EXISTS:libevent::extra>
|
| 292 |
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
|
| 293 |
+
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
|
| 294 |
$<TARGET_NAME_IF_EXISTS:USDT::headers>
|
| 295 |
)
|
| 296 |
|