- cmake now dynamically detects some versions of miniupnpc

This commit is contained in:
Mark Vejvoda
2012-06-05 22:29:43 +00:00
parent f78f6bba9b
commit c629fae830

View File

@@ -204,18 +204,6 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
#set (FTGL_LINK_TARGETS ) #set (FTGL_LINK_TARGETS )
ENDIF(USE_FTGL) ENDIF(USE_FTGL)
IF(MINIUPNPC_VERSION_PRE1_5)
ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_5)
message(STATUS "Adding macro for miniupnpc version: pre v1.5")
ENDIF()
IF(MINIUPNPC_VERSION_PRE1_6)
ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_6)
message(STATUS "Adding macro for miniupnpc version: pre v1.6")
ENDIF()
IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6)
message(STATUS "**No macro's required for miniupnpc version")
ENDIF()
OPTION(USE_FREETYPEGL "Use Freetype-GL for on-screen fonts" OFF) OPTION(USE_FREETYPEGL "Use Freetype-GL for on-screen fonts" OFF)
if(USE_FREETYPEGL) if(USE_FREETYPEGL)
ADD_DEFINITIONS(-DUSE_FREETYPEGL) ADD_DEFINITIONS(-DUSE_FREETYPEGL)
@@ -296,6 +284,18 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY})
endif() endif()
IF(MINIUPNPC_VERSION_PRE1_5)
ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_5)
message(STATUS "Adding macro for miniupnpc version: pre v1.5")
ENDIF()
IF(MINIUPNPC_VERSION_PRE1_6)
ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_6)
message(STATUS "Adding macro for miniupnpc version: pre v1.6")
ENDIF()
IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6)
message(STATUS "**No macro's required for miniupnpc version")
ENDIF()
IF(APPLE) IF(APPLE)
SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/sdl) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/sdl)
SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/posix) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/posix)