From 0385e6f5f8507d0c8163c49c8b0099ad5a7d7cba Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 21 Jun 2013 18:43:17 +0000 Subject: [PATCH] bugfix for libminiupnpc cmake script --- mk/cmake/Modules/FindMiniupnpc.cmake | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/mk/cmake/Modules/FindMiniupnpc.cmake b/mk/cmake/Modules/FindMiniupnpc.cmake index f2d21f1d..77456d11 100644 --- a/mk/cmake/Modules/FindMiniupnpc.cmake +++ b/mk/cmake/Modules/FindMiniupnpc.cmake @@ -33,9 +33,24 @@ if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) set(MINIUPNP_FIND_QUIETLY TRUE) endif (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) -find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h - PATH_SUFFIXES miniupnpc) -find_library(MINIUPNP_LIBRARY miniupnpc) +SET(MINIUPNPC_DIR_SEARCH $ENV{MINIUPNPC_ROOT}) + +#find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h +# PATH_SUFFIXES miniupnpc) + +FIND_PATH(MINIUPNPC_INCLUDE_DIR miniupnpc.h + ${MINIUPNPC_DIR_SEARCH}/include/miniupnpc + /usr/include/miniupnpc + /usr/local/include/miniupnpc) + +#find_library(MINIUPNP_LIBRARY miniupnpc) + +FIND_LIBRARY(MINIUPNPC_LIBRARY NAMES miniupnpc + PATHS + ${MINIUPNPC_DIR_SEARCH}/lib + /usr/${LIB_DESTINATION} + /usr/local/${LIB_DESTINATION} + /usr/lib) if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) set (MINIUPNP_FOUND TRUE) @@ -175,5 +190,7 @@ else () message (STATUS "Could not find miniupnp") endif () -MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY) +MARK_AS_ADVANCED( + MINIUPNPC_INCLUDE_DIR + MINIUPNPC_LIBRARY)