Merge pull request #585
88b0fb1
let miniupnp's cmakelist handle defaults (Riccardo Spagni)
This commit is contained in:
commit
e739baf40a
2 changed files with 1 additions and 4 deletions
3
external/CMakeLists.txt
vendored
3
external/CMakeLists.txt
vendored
|
@ -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
2
external/miniupnpc/CMakeLists.txt
vendored
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue