Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix for libminiupnpc cmake script

This commit is contained in:
Mark Vejvoda 2013-06-21 19:19:38 +00:00
parent 0c56e13e7a
commit 7b4a724764
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/cmake/Modules/FindMiniupnpc.cmake
View File

@ -40,12 +40,12 @@ SET(MINIUPNPC_DIR_SEARCH $ENV{MINIUPNPC_ROOT})
#find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
# PATH_SUFFIXES miniupnpc)
FIND_PATH(MINIUPNPC_INCLUDE_DIR miniupnpc.h
FIND_PATH(MINIUPNP_INCLUDE_DIR miniupnpc.h
${MINIUPNPC_DIR_SEARCH}/include/miniupnpc
/usr/include/miniupnpc
/usr/local/include/miniupnpc)
message(STATUS "Finding miniupnpc.h result: ${MINIUPNPC_INCLUDE_DIR}")
message(STATUS "Finding miniupnpc.h result: ${MINIUPNP_INCLUDE_DIR}")
#find_library(MINIUPNP_LIBRARY miniupnpc)
@ -55,9 +55,9 @@ ELSE()
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc.so miniupnpc)
ENDIF()
FIND_LIBRARY(MINIUPNPC_LIBRARY NAMES ${MINIUPNPC_LIBRARY_NAMES})
FIND_LIBRARY(MINIUPNP_LIBRARY NAMES ${MINIUPNPC_LIBRARY_NAMES})
message(STATUS "Finding miniupnpc lib result: ${MINIUPNPC_LIBRARY}")
message(STATUS "Finding miniupnpc lib result: ${MINIUPNP_LIBRARY}")
if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
set (MINIUPNP_FOUND TRUE)

2
source/shared_lib/CMakeLists.txt
View File

@ -316,7 +316,7 @@ option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/miniupnpc)
else()
MESSAGE(STATUS "*** Using SHARED miniupnpc found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]")
MESSAGE(STATUS "*** Using miniupnpc lib found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]")
INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY})