From 7b6c08d5dac6e4b42e81692e2d5297a213c75e04 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 17 Jun 2018 22:34:11 +0100 Subject: 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. --- external/CMakeLists.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'external') 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) -- cgit v1.2.3