aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2021-01-12 14:00:42 +0100
committerselsta <selsta@sent.at>2021-01-12 17:14:58 +0100
commit576bb88628eab1ca0f760c5d5da31dcbda7f1eff (patch)
tree879dae7d4262223e8d3e0f0af886bc1cf063109c /external
parentMerge pull request #7286 (diff)
downloadmonero-576bb88628eab1ca0f760c5d5da31dcbda7f1eff.tar.xz
miniupnp: set submodule to upstream, disable install
Diffstat (limited to 'external')
-rw-r--r--external/CMakeLists.txt2
m---------external/miniupnp0
2 files changed, 2 insertions, 0 deletions
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