mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
miniupnp: set submodule to upstream, disable install
This commit is contained in:
parent
964ad0e51a
commit
576bb88628
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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
|
||||
|
2
external/CMakeLists.txt
vendored
2
external/CMakeLists.txt
vendored
@ -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)
|
||||
|
2
external/miniupnp
vendored
2
external/miniupnp
vendored
@ -1 +1 @@
|
||||
Subproject commit 4c700e09526a7d546394e85628c57e9490feefa0
|
||||
Subproject commit 544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0
|
Loading…
Reference in New Issue
Block a user