removed not required CURL module, renamed several cmake-build options for be more easy sortable by name

This commit is contained in:
filux
2015-09-27 19:46:35 +02:00
parent 4ad684deaf
commit 4bef525bf3
21 changed files with 358 additions and 406 deletions

View File

@@ -48,11 +48,10 @@ FIND_PATH(MINIUPNP_INCLUDE_DIR miniupnpc.h
#message(STATUS "Finding miniupnpc.h result: ${MINIUPNP_INCLUDE_DIR}")
#find_library(MINIUPNP_LIBRARY miniupnpc)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc miniupnpc)
IF(WANT_STATIC_LIBS)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a)
ELSE()
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_DYNAMIC_NAME} libminiupnpc.so miniupnpc)
IF(STATIC_Miniupnpc)
set(MINIUPNPC_LIBRARY_NAMES ${MINIUPNPC_LIBRARY_STATIC_NAME} libminiupnpc.a miniupnpc.a ${MINIUPNPC_LIBRARY_NAMES})
ENDIF()
FIND_LIBRARY(MINIUPNP_LIBRARY NAMES ${MINIUPNPC_LIBRARY_NAMES})