foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-05 14:06:27 -05:00
Code Issues Activity

build: Drop libnatpmp from build system

Browse source
This commit is contained in:
laanwj 2024-05-05 16:40:11 +02:00
parent 7b04709862
commit 20a18bf6aa
5 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -121,11 +121,6 @@ option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting execu
option(WERROR "Treat compiler warnings as errors." OFF) option(WERROR "Treat compiler warnings as errors." OFF)
option(WITH_CCACHE "Attempt to use ccache for compiling." ON) option(WITH_CCACHE "Attempt to use ccache for compiling." ON)
option(WITH_NATPMP "Enable NAT-PMP." OFF)
if(WITH_NATPMP)
find_package(NATPMP MODULE REQUIRED)
endif()
option(WITH_MINIUPNPC "Enable UPnP." OFF) option(WITH_MINIUPNPC "Enable UPnP." OFF)
if(WITH_MINIUPNPC) if(WITH_MINIUPNPC)
find_package(MiniUPnPc MODULE REQUIRED) find_package(MiniUPnPc MODULE REQUIRED)
@ -239,7 +234,6 @@ if(BUILD_FOR_FUZZING)
set(BUILD_WALLET_TOOL OFF) set(BUILD_WALLET_TOOL OFF)
set(BUILD_GUI OFF) set(BUILD_GUI OFF)
set(ENABLE_EXTERNAL_SIGNER OFF) set(ENABLE_EXTERNAL_SIGNER OFF)
set(WITH_NATPMP OFF)
set(WITH_MINIUPNPC OFF) set(WITH_MINIUPNPC OFF)
set(WITH_ZMQ OFF) set(WITH_ZMQ OFF)
set(BUILD_TESTS OFF) set(BUILD_TESTS OFF)
@ -621,9 +615,7 @@ if(ENABLE_WALLET)
message(" - legacy wallets (Berkeley DB) ..... ${WITH_BDB}") message(" - legacy wallets (Berkeley DB) ..... ${WITH_BDB}")
endif() endif()
message(" external signer ..................... ${ENABLE_EXTERNAL_SIGNER}") message(" external signer ..................... ${ENABLE_EXTERNAL_SIGNER}")
message(" port mapping:") message(" port mapping using UPnP ............. ${WITH_MINIUPNPC}")
message(" - using NAT-PMP .................... ${WITH_NATPMP}")
message(" - using UPnP ....................... ${WITH_MINIUPNPC}")
message(" ZeroMQ .............................. ${WITH_ZMQ}") message(" ZeroMQ .............................. ${WITH_ZMQ}")
message(" USDT tracing ........................ ${WITH_USDT}") message(" USDT tracing ........................ ${WITH_USDT}")
message(" QR code (GUI) ....................... ${WITH_QRENCODE}") message(" QR code (GUI) ....................... ${WITH_QRENCODE}")

1
CMakePresets.json
View file

@ -86,7 +86,6 @@
"WITH_BDB": "ON", "WITH_BDB": "ON",
"WITH_MINIUPNPC": "ON", "WITH_MINIUPNPC": "ON",
"WITH_MULTIPROCESS": "ON", "WITH_MULTIPROCESS": "ON",
"WITH_NATPMP": "ON",
"WITH_QRENCODE": "ON", "WITH_QRENCODE": "ON",
"WITH_SQLITE": "ON", "WITH_SQLITE": "ON",
"WITH_USDT": "ON", "WITH_USDT": "ON",

32
cmake/module/FindNATPMP.cmake
View file

@ -1,32 +0,0 @@
# Copyright (c) 2023-present The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or https://opensource.org/license/mit/.
find_path(NATPMP_INCLUDE_DIR
NAMES natpmp.h
)
find_library(NATPMP_LIBRARY
NAMES natpmp
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NATPMP
REQUIRED_VARS NATPMP_LIBRARY NATPMP_INCLUDE_DIR
)
if(NATPMP_FOUND AND NOT TARGET NATPMP::NATPMP)
add_library(NATPMP::NATPMP UNKNOWN IMPORTED)
set_target_properties(NATPMP::NATPMP PROPERTIES
IMPORTED_LOCATION "${NATPMP_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${NATPMP_INCLUDE_DIR}"
)
set_property(TARGET NATPMP::NATPMP PROPERTY
INTERFACE_COMPILE_DEFINITIONS USE_NATPMP=1 $<$<PLATFORM_ID:Windows>:NATPMP_STATICLIB>
)
endif()
mark_as_advanced(
NATPMP_INCLUDE_DIR
NATPMP_LIBRARY
)

1
src/CMakeLists.txt
View file

@ -292,7 +292,6 @@ target_link_libraries(bitcoin_node
Boost::headers Boost::headers
$<TARGET_NAME_IF_EXISTS:libevent::libevent> $<TARGET_NAME_IF_EXISTS:libevent::libevent>
$<TARGET_NAME_IF_EXISTS:libevent::pthreads> $<TARGET_NAME_IF_EXISTS:libevent::pthreads>
$<TARGET_NAME_IF_EXISTS:NATPMP::NATPMP>
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc> $<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
$<TARGET_NAME_IF_EXISTS:bitcoin_zmq> $<TARGET_NAME_IF_EXISTS:bitcoin_zmq>
$<TARGET_NAME_IF_EXISTS:USDT::headers> $<TARGET_NAME_IF_EXISTS:USDT::headers>

1
src/qt/CMakeLists.txt
View file

@ -133,7 +133,6 @@ target_link_libraries(bitcoinqt
bitcoin_cli bitcoin_cli
leveldb leveldb
Boost::headers Boost::headers
$<TARGET_NAME_IF_EXISTS:NATPMP::NATPMP>
$<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc> $<TARGET_NAME_IF_EXISTS:MiniUPnPc::MiniUPnPc>
$<TARGET_NAME_IF_EXISTS:PkgConfig::libqrencode> $<TARGET_NAME_IF_EXISTS:PkgConfig::libqrencode>
$<$<PLATFORM_ID:Darwin>:-framework\ AppKit> $<$<PLATFORM_ID:Darwin>:-framework\ AppKit>