From 58892be4adcafbc19e2442d073f27d5f9bd9482d Mon Sep 17 00:00:00 2001 From: selsta Date: Tue, 12 Jan 2021 14:00:42 +0100 Subject: miniupnp: set submodule to upstream, disable install --- .gitmodules | 3 +-- external/CMakeLists.txt | 2 ++ external/miniupnp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9dacf534f..3cf831bcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,7 @@ branch = monero [submodule "external/miniupnp"] path = external/miniupnp - url = https://github.com/monero-project/miniupnp - branch = monero + url = https://github.com/miniupnp/miniupnp [submodule "external/rapidjson"] path = external/rapidjson url = https://github.com/Tencent/rapidjson diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index a8916a7d0..7ae4ba750 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -38,8 +38,10 @@ find_package(Miniupnpc REQUIRED) message(STATUS "Using in-tree miniupnpc") +set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) add_subdirectory(miniupnp/miniupnpc) set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) if(MSVC) set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") elseif(NOT MSVC) diff --git a/external/miniupnp b/external/miniupnp index 4c700e095..544e6fcc7 160000 --- a/external/miniupnp +++ b/external/miniupnp @@ -1 +1 @@ -Subproject commit 4c700e09526a7d546394e85628c57e9490feefa0 +Subproject commit 544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0 -- cgit v1.2.3