PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

Merge pull request #615 from AMDmi3/miniupnpc-library-detection

Browse Source 
Find miniupnpc library as well as header
This commit is contained in:
orignal 2016-08-19 07:01:35 -04:00 committed by GitHub
commit 65c003eef8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/CMakeLists.txt
View File

@ -357,7 +357,7 @@ if (WITH_BINARY)
endif () endif ()
if (WITH_UPNP) if (WITH_UPNP)
target_link_libraries("${PROJECT_NAME}" "miniupnpc") target_link_libraries("${PROJECT_NAME}" "${MINIUPNPC_LIBRARY}")
endif () endif ()
# FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04 # FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04

11
build/cmake_modules/FindMiniUPnPc.cmake
View File

@ -1,6 +1,6 @@
# - Find MINIUPNPC # - Find MINIUPNPC
if(MINIUPNPC_INCLUDE_DIR) if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
set(MINIUPNPC_FOUND TRUE) set(MINIUPNPC_FOUND TRUE)
else() else()
@ -11,15 +11,18 @@ else()
$ENV{SystemDrive} $ENV{SystemDrive}
${PROJECT_SOURCE_DIR}/../.. ${PROJECT_SOURCE_DIR}/../..
) )
if(MINIUPNPC_INCLUDE_DIR) find_library(MINIUPNPC_LIBRARY miniupnpc)
if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
set(MINIUPNPC_FOUND TRUE) set(MINIUPNPC_FOUND TRUE)
message(STATUS "Found MiniUPnP headers: ${MINIUPNPC_INCLUDE_DIR}") message(STATUS "Found MiniUPnP headers: ${MINIUPNPC_INCLUDE_DIR}")
message(STATUS "Found MiniUPnP library: ${MINIUPNPC_LIBRARY}")
else() else()
set(MINIUPNPC_FOUND FALSE) set(MINIUPNPC_FOUND FALSE)
message(STATUS "MiniUPnP not found.") message(STATUS "MiniUPnP not found.")
endif() endif()
mark_as_advanced(MINIUPNPC_INCLUDE_DIR) mark_as_advanced(MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY)
endif() endif()