aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--external/CMakeLists.txt2
m---------external/miniupnp0
3 files changed, 3 insertions, 2 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
-Subproject 4c700e09526a7d546394e85628c57e9490feefa
+Subproject 544e6fcc73c5ad9af48a8985c94f0f1d742ef2e