aboutsummaryrefslogtreecommitdiff
path: root/external/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'external/CMakeLists.txt')
-rwxr-xr-xexternal/CMakeLists.txt7
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()