mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
miniupnp: set submodule to upstream, disable install
This commit is contained in:
parent
964ad0e51a
commit
576bb88628
3 changed files with 4 additions and 3 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -4,8 +4,7 @@
|
||||||
branch = monero
|
branch = monero
|
||||||
[submodule "external/miniupnp"]
|
[submodule "external/miniupnp"]
|
||||||
path = external/miniupnp
|
path = external/miniupnp
|
||||||
url = https://github.com/monero-project/miniupnp
|
url = https://github.com/miniupnp/miniupnp
|
||||||
branch = monero
|
|
||||||
[submodule "external/rapidjson"]
|
[submodule "external/rapidjson"]
|
||||||
path = external/rapidjson
|
path = external/rapidjson
|
||||||
url = https://github.com/Tencent/rapidjson
|
url = https://github.com/Tencent/rapidjson
|
||||||
|
|
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
|
@ -38,8 +38,10 @@
|
||||||
find_package(Miniupnpc REQUIRED)
|
find_package(Miniupnpc REQUIRED)
|
||||||
|
|
||||||
message(STATUS "Using in-tree miniupnpc")
|
message(STATUS "Using in-tree miniupnpc")
|
||||||
|
set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
|
||||||
add_subdirectory(miniupnp/miniupnpc)
|
add_subdirectory(miniupnp/miniupnpc)
|
||||||
set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
|
set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
|
||||||
|
set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
|
set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
|
||||||
elseif(NOT MSVC)
|
elseif(NOT MSVC)
|
||||||
|
|
2
external/miniupnp
vendored
2
external/miniupnp
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 4c700e09526a7d546394e85628c57e9490feefa0
|
Subproject commit 544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0
|
Loading…
Reference in a new issue