Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2618


Ignore:
Timestamp:
Jan 29, 2009, 11:11:45 PM (15 years ago)
Author:
rgrieder
Message:
  • Functionised CheckOGREPlugins.cmake
  • Updated LibraryConfigMSVC.cmake and LibraryConfigMinGW.cmake
  • Some more changes in LibraryConfig.cmake and BuildConfig.cmake
Location:
code/branches/buildsystem2/cmake
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/cmake/BuildConfig.cmake

    r2612 r2618  
    3333SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
    3434
     35# Sets where to find the external libraries like OgreMain.dll at runtime
     36# On Unix you should not have to change this at all.
     37IF(NOT ORXONOX_LIBRARY_BIN_DIR)
     38  SET(ORXONOX_LIBRARY_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     39ENDIF(NOT ORXONOX_LIBRARY_BIN_DIR)
     40
    3541# Set Debug build to default when not having multi-config generator like msvc
    36 IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    37   SET(CMAKE_BUILD_TYPE "Debug")
    38 ENDIF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    39 
    40 # When searching for debug libraries, this is appended to the libarary name
    41 SET(LIBRARY_DEBUG_POSTFIX "_d")
    42 # Sets where to find the binary directory of external libraries
    43 SET(ORXONOX_LIBRARY_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
    44 # Working directory for the tolua parser. Adjust for windows because lua.dll has to be there!
    45 SET(TOLUA_PARSER_WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
     42IF(NOT CMAKE_CONFIGURATION_TYPES)
     43  IF(NOT CMAKE_BUILD_TYPE)
     44    SET(CMAKE_BUILD_TYPE Debug CACHE STRING
     45        "Build types are: Debug, Release, MinSizeRel, RelWithDebInfo" FORCE)
     46  ENDIF(NOT CMAKE_BUILD_TYPE)
     47  MARK_AS_ADVANCED(CLEAR CMAKE_BUILD_TYPE)
     48ELSE(NOT CMAKE_CONFIGURATION_TYPES)
     49  IF(CMAKE_BUILD_TYPE)
     50    SET(CMAKE_BUILD_TYPE CACHE STRING FORCE)
     51  ENDIF(CMAKE_BUILD_TYPE)
     52  MARK_AS_ADVANCED(CMAKE_BUILD_TYPE)
     53ENDIF(NOT CMAKE_CONFIGURATION_TYPES)
    4654
    4755OPTION(EXTRA_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
     
    5563# More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager
    5664# Render systems may be optional, but at least one has to be found in FindOgre
    57 SET(OGRE_PLUGINS RenderSystem_GL RenderSystem_Direct3D9 Plugin_ParticleFX)
     65SET(OGRE_PLUGINS_INT RenderSystem_GL RenderSystem_Direct3D9 Plugin_ParticleFX)
    5866IF(WIN32)
    5967  # CG program manager is probably DirectX related (not available under unix)
    60   LIST(APPEND OGRE_PLUGINS Plugin_CgProgramManager)
     68  LIST(APPEND OGRE_PLUGINS_INT Plugin_CgProgramManager)
    6169ENDIF(WIN32)
     70SET(OGRE_PLUGINS ${OGRE_PLUGINS_INT} CACHE STRING
     71   "Specify which OGRE plugins to load. Existance check is performed.")
    6272
    6373# Check the plugins and determine the plugin folder
    6474# You can give a hint by setting the environment variable ENV{OGRE_PLUGIN_DIR}
    6575INCLUDE(CheckOGREPlugins)
     76CHECK_OGRE_PLUGINS(${OGRE_PLUGINS})
    6677
    6778
  • code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake

    r2612 r2618  
    1 IF(WIN32)
     1#    Author: Reto '1337' Grieder (2008)
     2#
     3#    This program is free software; you can redistribute it and/or modify
     4#    it under the terms of the GNU General Public License as published by
     5#    the Free Software Foundation; either version 2 of the License, or
     6#    (at your option) any later version.
     7#
     8#    This program is distributed in the hope that it will be useful,
     9#    but WITHOUT ANY WARRANTY; without even the implied warranty of
     10#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     11#    GNU General Public License for more details.
     12#
     13#    You should have received a copy of the GNU General Public License
     14#    along with this program; if not, write to the Free Software
     15#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
     16
     17###################################################
     18# Make sure we have the required plugins for OGRE #
     19###################################################
     20
     21FUNCTION(CHECK_OGRE_PLUGINS)
     22
     23  SET(OGRE_PLUGINS ${ARGN})
     24
     25  IF(WIN32)
    226    # On Windows we need only *.dll, not *.lib. Especially the MSVC generator doesn't look for *.dll
    3     SET(CMAKE_FIND_LIBRARY_SUFFIXES_STORED ${CMAKE_FIND_LIBRARY_SUFFIXES})
    427    SET(CMAKE_FIND_LIBRARY_SUFFIXES .dll)
    5 ENDIF(WIN32)
    6 SET(CMAKE_FIND_LIBRARY_PREFIXES_STORED "${CMAKE_FIND_LIBRARY_PREFIXES}")
    7 SET(CMAKE_FIND_LIBRARY_PREFIXES "")
     28  ENDIF(WIN32)
     29  # Do not prefix "lib" on any platform
     30  SET(CMAKE_FIND_LIBRARY_PREFIXES "")
    831
    9 SET(OGRE_RENDER_SYSTEM_FOUND FALSE)
    10 FOREACH(_plugin ${OGRE_PLUGINS})
     32  SET(OGRE_RENDER_SYSTEM_FOUND FALSE)
     33  FOREACH(_plugin ${OGRE_PLUGINS})
    1134    FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_OPTIMIZED
    12         NAMES ${_plugin}
    13         PATHS $ENV{OGRE_HOME} /usr/local /usr
    14         PATH_SUFFIXES lib lib/OGRE bin bin/Release bin/release Release release
     35      NAMES ${_plugin}
     36      PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
     37      PATH_SUFFIXES lib lib/OGRE bin bin/Release bin/release Release release
    1538    )
    1639    FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
    17         NAMES ${_plugin}${LIBRARY_DEBUG_POSTFIX}
    18         PATHS $ENV{OGRE_HOME} /usr/local /usr
    19         PATH_SUFFIXES lib lib/OGRE bin bin/Debug bin/debug Debug debug
     40      NAMES ${_plugin}d ${_plugin}_d
     41      PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
     42      PATH_SUFFIXES lib lib/OGRE bin bin/Debug bin/debug Debug debug
    2043    )
    21     # We only need at least one render system. Check at the end
     44    # We only need at least one render system. Check at the end.
    2245    IF(NOT ${_plugin} MATCHES "RenderSystem")
    23         IF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
    24             MESSAGE(FATAL_ERROR "Could not find OGRE plugin named ${_plugin}")
    25         ENDIF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
     46      IF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
     47        MESSAGE(FATAL_ERROR "Could not find OGRE plugin named ${_plugin}")
     48      ENDIF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
    2649    ELSEIF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
    2750      SET(OGRE_RENDER_SYSTEM_FOUND TRUE)
     
    2952
    3053    IF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
    31         # If debug version is not available, release will do as well
    32         IF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
    33             SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "" FORCE)
    34         ENDIF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
    35         MARK_AS_ADVANCED(OGRE_PLUGIN_${_plugin}_OPTIMIZED OGRE_PLUGIN_${_plugin}_DEBUG)
     54      # If debug version is not available, release will do as well
     55      IF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
     56        SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "" FORCE)
     57      ENDIF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
     58      MARK_AS_ADVANCED(OGRE_PLUGIN_${_plugin}_OPTIMIZED OGRE_PLUGIN_${_plugin}_DEBUG)
    3659
    37         ### Set variables to configure orxonox.ini correctly afterwards in bin/ ###
    38         # Check and set the folders
    39         GET_FILENAME_COMPONENT(_release_folder ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} PATH)
    40         IF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
    41             MESSAGE(FATAL_ERROR "Ogre release plugins have to be in the same folder!")
    42         ENDIF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
    43         SET(OGRE_PLUGINS_FOLDER_RELEASE ${_release_folder})
    44         GET_FILENAME_COMPONENT(_debug_folder ${OGRE_PLUGIN_${_plugin}_DEBUG} PATH)
    45         IF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
    46             MESSAGE(FATAL_ERROR "Ogre debug plugins have to be in the same folder!")
    47         ENDIF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
    48         SET(OGRE_PLUGINS_FOLDER_DEBUG ${_debug_folder})
     60      ### Set variables to configure orxonox.ini correctly afterwards in bin/ ###
     61      # Check and set the folders
     62      GET_FILENAME_COMPONENT(_release_folder ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} PATH)
     63      IF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
     64        MESSAGE(FATAL_ERROR "Ogre release plugins have to be in the same folder!")
     65      ENDIF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
     66      SET(OGRE_PLUGINS_FOLDER_RELEASE ${_release_folder})
     67      GET_FILENAME_COMPONENT(_debug_folder ${OGRE_PLUGIN_${_plugin}_DEBUG} PATH)
     68      IF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
     69        MESSAGE(FATAL_ERROR "Ogre debug plugins have to be in the same folder!")
     70      ENDIF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
     71      SET(OGRE_PLUGINS_FOLDER_DEBUG ${_debug_folder})
    4972
    50         # Create a list with the plugins for relase and debug configurations
    51         LIST(APPEND OGRE_PLUGINS_RELEASE ${_plugin})
    52         IF(OGRE_PLUGIN_${_plugin}_DEBUG)
    53             LIST(APPEND OGRE_PLUGINS_DEBUG ${_plugin}${LIBRARY_DEBUG_POSTFIX})
    54         ELSE(OGRE_PLUGIN_${_plugin}_DEBUG)
    55             LIST(APPEND OGRE_PLUGINS_DEBUG ${_plugin})
    56         ENDIF(OGRE_PLUGIN_${_plugin}_DEBUG)
     73      # Create a list with the plugins for relase and debug configurations
     74      LIST(APPEND OGRE_PLUGINS_RELEASE ${_plugin})
     75      IF(OGRE_PLUGIN_${_plugin}_DEBUG)
     76        # Determine debug postfix ("d" or "_d")
     77        IF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
     78          LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}_d")
     79        ELSE(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
     80          LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}d")
     81        ENDIF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
     82      ELSE(OGRE_PLUGIN_${_plugin}_DEBUG)
     83        LIST(APPEND OGRE_PLUGINS_DEBUG ${_plugin})
     84      ENDIF(OGRE_PLUGIN_${_plugin}_DEBUG)
    5785    ENDIF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
    58 ENDFOREACH(_plugin)
    59 IF(NOT OGRE_RENDER_SYSTEM_FOUND)
    60     MESSAGE(FATAL_ERROR "Could not find an OGRE render system plugin")
    61 ENDIF(NOT OGRE_RENDER_SYSTEM_FOUND)
    62 IF(WIN32)
    63     # Restore previous settings (see above before FOREACH)
    64     SET(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES_STORED}")
    65 ENDIF(WIN32)
    66 SET(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES_STORED}")
     86  ENDFOREACH(_plugin)
     87  IF(NOT OGRE_RENDER_SYSTEM_FOUND)
     88      MESSAGE(FATAL_ERROR "Could not find an OGRE render system plugin")
     89  ENDIF(NOT OGRE_RENDER_SYSTEM_FOUND)
    6790
    68 # List has to be comma separated for orxonox.ini
    69 STRING(REPLACE ";" ", " OGRE_PLUGINS_RELEASE "${OGRE_PLUGINS_RELEASE}")
    70 STRING(REPLACE ";" ", " OGRE_PLUGINS_DEBUG   "${OGRE_PLUGINS_DEBUG}")
     91  # List has to be comma separated for orxonox.ini
     92  STRING(REPLACE ";" ", " OGRE_PLUGINS_RELEASE "${OGRE_PLUGINS_RELEASE}")
     93  STRING(REPLACE ";" ", " OGRE_PLUGINS_DEBUG   "${OGRE_PLUGINS_DEBUG}")
     94
     95  # Set variables outside function scope
     96  SET(OGRE_PLUGINS_FOLDER_DEBUG ${OGRE_PLUGINS_FOLDER_DEBUG} PARENT_SCOPE)
     97  SET(OGRE_PLUGINS_FOLDER_RELEASE ${OGRE_PLUGINS_FOLDER_RELEASE} PARENT_SCOPE)
     98  SET(OGRE_PLUGINS_RELEASE ${OGRE_PLUGINS_RELEASE} PARENT_SCOPE)
     99  SET(OGRE_PLUGINS_DEBUG ${OGRE_PLUGINS_DEBUG} PARENT_SCOPE)
     100
     101ENDFUNCTION(CHECK_OGRE_PLUGINS)
  • code/branches/buildsystem2/cmake/LibraryConfig.cmake

    r2616 r2618  
     1INCLUDE(CompareVersionStrings)
     2INCLUDE(FindPackageHandleStandardArgs)
     3
     4################ Misc Options ###################
     5
     6OPTION(LIBRARY_USE_PACKAGE_IF_SUPPORTED
     7       "When set to false CMake will only look in the standard paths for libraries" ON)
     8
     9
     10############## Platform Scripts #################
     11
     12# Scripts for specific library and CMake config
     13INCLUDE(LibraryConfigTardis)
     14INCLUDE(LibraryConfigApple)
     15INCLUDE(LibraryConfigMSVC)
    116INCLUDE(LibraryConfigMinGW)
    2 INCLUDE(LibraryConfigMSVC)
    3 INCLUDE(LibraryConfigTardis)
     17
     18# User script
     19SET(LIBRARY_CONFIG_USER_SCRIPT "" CACHE FILEPATH
     20    "Specify a CMake script if you wish to write your own library path config.
     21     See LibraryConfigTardis.cmake or LibraryConfigMinGW.cmake for examples.")
     22IF(LIBRARY_CONFIG_USER_SCRIPT)
     23  IF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT}.cmake)
     24    INCLUDE(${LIBRARY_CONFIG_USER_SCRIPT})
     25  ELSEIF(EXISTS ${LIBRARY_CONFIG_USER_SCRIPT})
     26    INCLUDE(${LIBRARY_CONFIG_USER_SCRIPT})
     27  ELSEIF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
     28    INCLUDE(${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
     29  ENDIF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT}.cmake)
     30ENDIF(LIBRARY_CONFIG_USER_SCRIPT)
     31
    432
    533############### Library finding #################
     
    92120  LINK_DIRECTORIES(${BOOST_LINK_DIR})
    93121ENDIF (MSVC)
     122
     123
     124####### Static/Dynamic linking options ##########
     125
     126# On Windows dynamically linked libraries need some special treatment
     127# You may want to edit these settings if you provide your own libraries
     128# Note: Default option in the libraries vary, but our default option is dynamic
     129IF(WIN32)
     130  OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
     131  OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
     132  OPTION(LINK_ENET_DYNAMIC  "Link ENet dynamically on Windows" TRUE)
     133  OPTION(LINK_OGRE_DYNAMIC  "Link OGRE dynamically on Windows" TRUE)
     134  OPTION(LINK_TCL_DYNAMIC   "Link TCL dynamically on Windows" TRUE)
     135  OPTION(LINK_ZLIB_DYNAMIC  "Link ZLib dynamically on Windows" TRUE)
     136  COMPARE_VERSION_STRINGS("${LUA_VERSION}" "5.1" _version_comparison)
     137  IF(_version_comparison LESS 0)
     138    OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" FALSE)
     139  ELSE(_version_comparison LESS 0)
     140    OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" TRUE)
     141  ENDIF(_version_comparison LESS 0)
     142ENDIF(WIN32)
  • code/branches/buildsystem2/cmake/LibraryConfigMSVC.cmake

    r2612 r2618  
    2727 
    2828###################### MSVC config ########################
    29 # Set the library directories and special options when
    30 # using Visual Studio.
    31 ###########################################################
     29# Set the library directories when using Visual Studio.   #
    3230
    33 IF (MSVC)
     31IF (MSVC AND LIBRARY_USE_PACKAGE_IF_SUPPORTED)
    3432  MESSAGE(STATUS "Running on MSVC. Using customized paths and options.")
    35 
    36   ###################### Libraries ########################
    3733
    3834  # Determine library directory
     
    4945  # Note: When setting ENV${} variables, make sure to use quotes when
    5046  #       having multiple directories.
    51   SET(ENV{BOOST_ROOT}        ${MSVC_LIBRARY_DIR}/boost-1.35.0)
     47  SET(BOOST_ROOT             ${MSVC_LIBRARY_DIR}/boost-1.35.0)
     48  SET(BOOST_LIBRARYDIR       ${MSVC_LIBRARY_DIR}/boost-1.35.0/lib)
    5249  SET(ENV{CEGUIDIR}          ${MSVC_LIBRARY_DIR}/cegui-0.6.1)
    5350  SET(ENV{ENETDIR}           ${MSVC_LIBRARY_DIR}/enet-1.2)
     
    5754  SET(ENV{OPENALDIR}         ${MSVC_LIBRARY_DIR}/openal-1.1)
    5855  SET(ENV{LUA_DIR}           ${MSVC_LIBRARY_DIR}/lua-5.1.3)
    59   SET(ENV{OGRE_HOME}        "${MSVC_LIBRARY_DIR}/ogre-1.4.9;${ORXONOX_LIBRARY_BIN_DIR}")
    60   SET(TCL_INCLUDE_PATH       ${MSVC_LIBRARY_DIR}/tcl-8.5.2/include)
    61   SET(TCL_LIBRARY            ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
    62   # Do some hacking to avoid "Tclsh not found" message
    63   SET(TCL_TCLSH              ${MSVC_LIBRARY_DIR}/tcl-8.5.2/lib/tcl85t.lib)
     56  SET(ENV{OGRE_HOME}         ${MSVC_LIBRARY_DIR}/ogre-1.4.9)
     57  SET(ENV{OGRE_PLUGIN_DIR}   ${MSVC_LIBRARY_DIR}/bin)
     58  SET(TCL_INCLUDE_PATH       ${MSVC_LIBRARY_DIR}/tcl-8.5.5/include)
     59  SET(TCL_LIBRARY            ${MSVC_LIBRARY_DIR}/tcl-8.5.5/lib/tcl85.lib)
    6460  SET(ZLIB_INCLUDE_DIR       ${MSVC_LIBRARY_DIR}/zlib-1.2.3/include)
    6561  SET(ZLIB_LIBRARY optimized ${MSVC_LIBRARY_DIR}/zlib-1.2.3/lib/zlib.lib
    6662                   debug     ${MSVC_LIBRARY_DIR}/zlib-1.2.3/lib/zlib_d.lib)
    67   SET(ZLIB_FOUND TRUE)
     63  IF ($ENV{DXSDK_DIR} STREQUAL "")
     64    SET(ENV{DXSDK_DIR}       ${MSVC_LIBRARY_DIR}/directx-sdk-aug-2007)
     65  ENDIF ($ENV{DXSDK_DIR} STREQUAL "")
    6866
    69   ######################### Misc ##########################
    70 
    71   # Set tolua working directory because lua.dll is not where tolua is
    72   SET(TOLUA_PARSER_WORKING_DIRECTORY ${ORXONOX_LIBRARY_BIN_DIR})
    73 ENDIF (MSVC)
     67ENDIF (MSVC AND LIBRARY_USE_PACKAGE_IF_SUPPORTED)
  • code/branches/buildsystem2/cmake/LibraryConfigMinGW.cmake

    r2612 r2618  
    3131###################################################
    3232
    33 IF (MINGW)
     33IF (MINGW AND LIBRARY_USE_PACKAGE_IF_SUPPORTED)
    3434  MESSAGE(STATUS "Running on MinGW. Using customized paths and options.")
    3535
     
    4646  # Note: When setting ENV${} variables, make sure to use quotes when
    4747  #       having multiple directories.
    48   SET(ENV{BOOST_ROOT}    "${MINGW_LIBRARY_DIR}/boost_1_34_1")
    49   SET(ENV{CEGUIDIR}      "${MINGW_LIBRARY_DIR}/cegui-0.6.1")
    50   SET(ENV{ENETDIR}       "${MINGW_LIBRARY_DIR}/enet-1.1")
    51   SET(ENV{ALUTDIR}       "${MINGW_LIBRARY_DIR}/freealut-1.1.0")
    52   SET(ENV{OGGDIR}        "${MINGW_LIBRARY_DIR}/libogg-1.1.3;${MINGW_LIBRARY_DIR}/libogg-1.1.3/src/.libs")
    53   SET(ENV{VORBISDIR}     "${MINGW_LIBRARY_DIR}/libvorbis-1.2.0;${MINGW_LIBRARY_DIR}/libvorbis-1.2.0/lib/.libs")
    54   SET(ENV{OPENALDIR}     "${MINGW_LIBRARY_DIR}/openal-0.0.8/common;${MINGW_LIBRARY_DIR}/openal-0.0.8/src/.libs")
    55   SET(ENV{LUA_DIR}       "${MINGW_LIBRARY_DIR}/lua-5.1.3")
    56   SET(ENV{OGRE_HOME}     "${MINGW_LIBRARY_DIR}/ogre/OgreMain;${MINGW_LIBRARY_DIR}/ogre/Samples/Common")
    57   SET(TCL_INCLUDE_PATH   "${MINGW_LIBRARY_DIR}/tcl8.5.2/generic")
    58   SET(TCL_LIBRARY        "${MINGW_LIBRARY_DIR}/tcl8.5.2/win/tcl85.dll")
    59   # Do some hacking to avoid "Tclsh not found" message
    60   SET(TCL_TCLSH          "${MINGW_LIBRARY_DIR}/tcl8.5.2/win/tcl85.dll")
    61   SET(ZLIB_INCLUDE_DIR   "${MINGW_LIBRARY_DIR}/zlib/include")
    62   SET(ZLIB_LIBRARY       "${MINGW_LIBRARY_DIR}/zlib/libzlib.a")
     48  # Using BOOST_ROOT only does not work with CMake 2.6.0 (2.6.2 works though)
     49  SET(BOOST_INCLUDEDIR      "${MINGW_LIBRARY_DIR}/boost_1_34_1")
     50  SET(BOOST_LIBRARYDIR      "${MINGW_LIBRARY_DIR}/boost_1_34_1/stage/lib")
     51  SET(ENV{CEGUIDIR}         "${MINGW_LIBRARY_DIR}/cegui-0.6.1")
     52  SET(ENV{ENETDIR}          "${MINGW_LIBRARY_DIR}/enet-1.1")
     53  SET(LINK_ENET_DYNAMIC     FALSE)
     54  SET(ENV{ALUTDIR}          "${MINGW_LIBRARY_DIR}/freealut-1.1.0")
     55  SET(ENV{OGGDIR}           "${MINGW_LIBRARY_DIR}/libogg-1.1.3;${MINGW_LIBRARY_DIR}/libogg-1.1.3/src/.libs")
     56  SET(ENV{VORBISDIR}        "${MINGW_LIBRARY_DIR}/libvorbis-1.2.0;${MINGW_LIBRARY_DIR}/libvorbis-1.2.0/lib/.libs")
     57  SET(ENV{OPENALDIR}        "${MINGW_LIBRARY_DIR}/openal-0.0.8/common;${MINGW_LIBRARY_DIR}/openal-0.0.8/src/.libs")
     58  SET(ENV{LUA_DIR}          "${MINGW_LIBRARY_DIR}/lua-5.1.3")
     59  SET(ENV{OGRE_HOME}        "${MINGW_LIBRARY_DIR}/ogre/OgreMain;${MINGW_LIBRARY_DIR}")
     60  SET(ENV{OGRE_PLUGIN_DIR}  "${MINGW_LIBRARY_DIR}/ogre/Samples/Common")
     61  SET(TCL_INCLUDE_PATH      "${MINGW_LIBRARY_DIR}/tcl8.5.2/generic")
     62  SET(TCL_LIBRARY           "${MINGW_LIBRARY_DIR}/tcl8.5.2/win/tcl85.dll")
     63  SET(ZLIB_INCLUDE_DIR      "${MINGW_LIBRARY_DIR}/zlib/include")
     64  SET(ZLIB_LIBRARY          "${MINGW_LIBRARY_DIR}/zlib/libzlib.a")
     65  SET(LINK_ZLIB_DYNAMIC    FALSE)
    6366  IF ($ENV{DXSDK_DIR} STREQUAL "")
    64     SET(ENV{DXSDK_DIR} "${MINGW_LIBRARY_DIR}/DXSDK")
     67    SET(ENV{DXSDK_DIR}      "${MINGW_LIBRARY_DIR}/DXSDK")
    6568  ENDIF ($ENV{DXSDK_DIR} STREQUAL "")
    66 
    67   # MINGW doesn't like the -fPIC flag, reconfigure flags
    68   SET(CMAKE_C_FLAGS   "$ENV{CFLAGS}   ${ORXONOX_WARNING_FLAGS}")
    69   SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} ${ORXONOX_WARNING_FLAGS}")
    70 
    71   # Also set the tolua working directory because lua.dll is not where tolua ia
    72   SET(TOLUA_PARSER_WORKING_DIRECTORY "${MNGW_LIBRARY_DIR}/lua-5.1.3/lib")
    73 
    74 ENDIF (MINGW)
     69ENDIF (MINGW AND LIBRARY_USE_PACKAGE_IF_SUPPORTED)
  • code/branches/buildsystem2/cmake/LibraryConfigTardis.cmake

    r2612 r2618  
    1313IF (TARDIS)
    1414  MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
     15
     16  # We cannot use the default compiler (why?)
    1517  SET(CMAKE_C_COMPILER "gcc-4.1")
    1618  SET(CMAKE_CXX_COMPILER "g++-4.1")
  • code/branches/buildsystem2/cmake/UseTolua.cmake

    r2583 r2618  
    4444    DEPENDS              ${TOLUA_PARSER_DEPENDENCIES}
    4545    IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
    46     WORKING_DIRECTORY    ${TOLUA_PARSER_WORKING_DIRECTORY}
     46    WORKING_DIRECTORY    ${ORXONOX_LIBRARY_BIN_DIR}
    4747    COMMENT "Generating tolua bind files for package ${_tolua_package}"
    4848  )
Note: See TracChangeset for help on using the changeset viewer.