diff options
| author | fluffypony <ric@spagni.net> | 2014-09-10 20:01:30 +0200 |
|---|---|---|
| committer | fluffypony <ric@spagni.net> | 2014-09-10 20:01:30 +0200 |
| commit | 8d8b47e69f6bd1cfbd8f94c8ffc30b0ad3f19fc0 (patch) | |
| tree | 063662186142e644d1b48afd213a8e800792da1d /external | |
| parent | miniupnpc includes fixed (diff) | |
| download | monero-8d8b47e69f6bd1cfbd8f94c8ffc30b0ad3f19fc0.tar.xz | |
more dynamic miniupnp fixes
Diffstat (limited to 'external')
| -rwxr-xr-x | external/CMakeLists.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 481fbe9db..bf3dd6017 100755 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -3,16 +3,15 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER) - message(STATUS "Using shared miniupnpc") + message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}") include_directories(${MINIUPNP_INCLUDE_DIR}) - set(UPNP_LIBRARIES "miniupnpc") else() message(STATUS "Using static miniupnpc from external") - add_subdirectory(miniupnpc) 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") if(MSVC) @@ -20,6 +19,4 @@ else() elseif(NOT MSVC) set_property(TARGET upnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") endif() - - set(UPNP_LIBRARIES "upnpc-static") endif() |