nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #585

Browse Source 
88b0fb1 let miniupnp's cmakelist handle defaults (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2015-12-31 15:16:44 +02:00
commit e739baf40a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/CMakeLists.txt vendored
View File

@ -60,9 +60,6 @@ else()
message(STATUS "Using miniupnpc from local source tree (/external/miniupnpc)")
endif()
set(UPNPC_BUILD_STATIC ON CACHE BOOL "Build static library")
set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Build shared library")
set(UPNPC_BUILD_TESTS OFF CACHE BOOL "Build test executables")
add_subdirectory(miniupnpc)
set_property(TARGET upnpc-static PROPERTY FOLDER "external")

2
external/miniupnpc/CMakeLists.txt vendored
View File

@ -18,7 +18,7 @@ endif()
]]
option (UPNPC_BUILD_STATIC "Build static library" TRUE)
option (UPNPC_BUILD_SHARED "Build shared library" TRUE)
option (UPNPC_BUILD_SHARED "Build shared library" FALSE)
if (NOT WIN32)
option (UPNPC_BUILD_TESTS "Build test executables" FALSE)
endif (NOT WIN32)