diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-31 15:16:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-31 15:16:44 +0200 |
| commit | e739baf40a527d6760817008fe9eb660fa711d60 (patch) | |
| tree | b1fbb8917e79f084f7f5a2bae4ba52da993bbaba | |
| parent | Merge pull request #584 (diff) | |
| parent | let miniupnp's cmakelist handle defaults (diff) | |
| download | monero-e739baf40a527d6760817008fe9eb660fa711d60.tar.xz | |
Merge pull request #585
88b0fb1 let miniupnp's cmakelist handle defaults (Riccardo Spagni)
| -rw-r--r-- | external/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | external/miniupnpc/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index eb6a1f294..d13f67b90 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -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") diff --git a/external/miniupnpc/CMakeLists.txt b/external/miniupnpc/CMakeLists.txt index 33fa8d663..51331ecb5 100644 --- a/external/miniupnpc/CMakeLists.txt +++ b/external/miniupnpc/CMakeLists.txt @@ -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) |