diff --git a/mk/cmake/Modules/FindMiniupnpc.cmake b/mk/cmake/Modules/FindMiniupnpc.cmake index f0e07ab30..2fac1dabe 100644 --- a/mk/cmake/Modules/FindMiniupnpc.cmake +++ b/mk/cmake/Modules/FindMiniupnpc.cmake @@ -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) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 4c6235a6e..7370f823e 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -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})