Skip to content

Commit 20a18bf

Browse files
committed
build: Drop libnatpmp from build system
1 parent 7b04709 commit 20a18bf

File tree

5 files changed

+1
-44
lines changed

5 files changed

+1
-44
lines changed

CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting execu
121121
option(WERROR "Treat compiler warnings as errors." OFF)
122122
option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
123123

124-
option(WITH_NATPMP "Enable NAT-PMP." OFF)
125-
if(WITH_NATPMP)
126-
find_package(NATPMP MODULE REQUIRED)
127-
endif()
128-
129124
option(WITH_MINIUPNPC "Enable UPnP." OFF)
130125
if(WITH_MINIUPNPC)
131126
find_package(MiniUPnPc MODULE REQUIRED)
@@ -239,7 +234,6 @@ if(BUILD_FOR_FUZZING)
239234
set(BUILD_WALLET_TOOL OFF)
240235
set(BUILD_GUI OFF)
241236
set(ENABLE_EXTERNAL_SIGNER OFF)
242-
set(WITH_NATPMP OFF)
243237
set(WITH_MINIUPNPC OFF)
244238
set(WITH_ZMQ OFF)
245239
set(BUILD_TESTS OFF)
@@ -621,9 +615,7 @@ if(ENABLE_WALLET)
621615
message(" - legacy wallets (Berkeley DB) ..... ${WITH_BDB}")
622616
endif()
623617
message(" external signer ..................... ${ENABLE_EXTERNAL_SIGNER}")
624-
message(" port mapping:")
625-
message(" - using NAT-PMP .................... ${WITH_NATPMP}")
626-
message(" - using UPnP ....................... ${WITH_MINIUPNPC}")
618+
message(" port mapping using UPnP ............. ${WITH_MINIUPNPC}")
627619
message(" ZeroMQ .............................. ${WITH_ZMQ}")
628620
message(" USDT tracing ........................ ${WITH_USDT}")
629621
message(" QR code (GUI) ....................... ${WITH_QRENCODE}")

CMakePresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"WITH_BDB": "ON",
8787
"WITH_MINIUPNPC": "ON",
8888
"WITH_MULTIPROCESS": "ON",
89-
"WITH_NATPMP": "ON",
9089
"WITH_QRENCODE": "ON",
9190
"WITH_SQLITE": "ON",
9291
"WITH_USDT": "ON",

cmake/module/FindNATPMP.cmake

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ target_link_libraries(bitcoin_node
292292
Boost::headers
293293
$<TARGET_NAME_IF_EXISTS:libevent::libevent>
294294
$<TARGET_NAME_IF_EXISTS:libevent::pthreads>
295-
$<TARGET_NAME_IF_EXISTS:NATPMP::NATPMP>
296295
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
297296
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
298297
$<TARGET_NAME_IF_EXISTS:USDT::headers>

src/qt/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ target_link_libraries(bitcoinqt
133133
bitcoin_cli
134134
leveldb
135135
Boost::headers
136-
$<TARGET_NAME_IF_EXISTS:NATPMP::NATPMP>
137136
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
138137
$<TARGET_NAME_IF_EXISTS:PkgConfig::libqrencode>
139138
$<$<PLATFORM_ID:Darwin>:-framework\ AppKit>

0 commit comments

Comments
 (0)