diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2018-06-17 22:34:11 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2019-11-05 00:33:48 +0000 |
| commit | 12e7236236557cd6b9e40cf97245544e9e5faa22 (patch) | |
| tree | fcf64777127e500766c835c1508952626b5a4173 | |
| parent | Merge pull request #6088 (diff) | |
| download | monero-12e7236236557cd6b9e40cf97245544e9e5faa22.tar.xz | |
Drop in-tree miniupnpc
Since 6b8539803184 ("Build: update CMake and p2p for in-tree
miniupnp"), a hard dependency is made on miniupnpc which is a git
submodule not part of the archive available upstream.
| -rw-r--r-- | external/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 71b165f4f..072a26d19 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -37,19 +37,9 @@ find_package(Miniupnpc REQUIRED) -message(STATUS "Using in-tree miniupnpc") -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -if(MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") -elseif(NOT MSVC) - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") -endif() -if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") - set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") -endif() - -set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) +set(UPNP_STATIC false PARENT_SCOPE) +set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) +set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) find_package(Unbound) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index f8094bfa8..aa039fa17 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -60,9 +60,9 @@ #include "cryptonote_core/cryptonote_core.h" #include "net/parse.h" -#include <miniupnp/miniupnpc/miniupnpc.h> -#include <miniupnp/miniupnpc/upnpcommands.h> -#include <miniupnp/miniupnpc/upnperrors.h> +#include <miniupnpc/miniupnpc.h> +#include <miniupnpc/upnpcommands.h> +#include <miniupnpc/upnperrors.h> #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" |