From c629fae83029d43243d8910bb7c87b8cd775589e Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 5 Jun 2012 22:29:43 +0000 Subject: [PATCH] - cmake now dynamically detects some versions of miniupnpc --- source/shared_lib/CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 307824dfb..a10eaf4b8 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -204,18 +204,6 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST #set (FTGL_LINK_TARGETS ) 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) if(USE_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}) 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) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/sdl) SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/posix)