diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-02-15 22:01:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 22:01:01 -0500 |
| commit | f47651578f55756823b8da3ebf9b28f752a5bc67 (patch) | |
| tree | 38c5a713283157b6ad1367945d19130785aac6fd | |
| parent | Merge pull request #7308 (diff) | |
| parent | miniupnp: set submodule to upstream, disable install (diff) | |
| download | monero-f47651578f55756823b8da3ebf9b28f752a5bc67.tar.xz | |
Merge pull request #7311 from selsta/miniupnp
miniupnp: set submodule to upstream, disable install
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 2 | ||||
| m--------- | external/miniupnp | 0 |
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 |