- Fix build with enabled UPNP

- Switch to opt_CMAKE_BOOL

PR:		211977
Reported by:	arabesc@bk.ru
This commit is contained in:
Dmitry Marakasov
2016-08-19 09:40:51 +00:00
parent 7b26116c22
commit d542d0e650
2 changed files with 43 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- build/CMakeLists.txt.orig 2016-08-12 15:07:00 UTC
+++ build/CMakeLists.txt
@@ -357,7 +357,7 @@ if (WITH_BINARY)
endif ()
if (WITH_UPNP)
- target_link_libraries("${PROJECT_NAME}" "miniupnpc")
+ target_link_libraries("${PROJECT_NAME}" "${MINIUPNPC_LIBRARY}")
endif ()
# FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04

View File

@@ -0,0 +1,32 @@
--- build/cmake_modules/FindMiniUPnPc.cmake.orig 2016-08-12 15:07:00 UTC
+++ build/cmake_modules/FindMiniUPnPc.cmake
@@ -1,6 +1,6 @@
# - Find MINIUPNPC
-if(MINIUPNPC_INCLUDE_DIR)
+if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
set(MINIUPNPC_FOUND TRUE)
else()
@@ -11,15 +11,18 @@ else()
$ENV{SystemDrive}
${PROJECT_SOURCE_DIR}/../..
)
-
- if(MINIUPNPC_INCLUDE_DIR)
+
+ find_library(MINIUPNPC_LIBRARY miniupnpc)
+
+ if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
set(MINIUPNPC_FOUND TRUE)
message(STATUS "Found MiniUPnP headers: ${MINIUPNPC_INCLUDE_DIR}")
+ message(STATUS "Found MiniUPnP library: ${MINIUPNPC_LIBRARY}")
else()
set(MINIUPNPC_FOUND FALSE)
message(STATUS "MiniUPnP not found.")
endif()
- mark_as_advanced(MINIUPNPC_INCLUDE_DIR)
+ mark_as_advanced(MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY)
endif()