Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1872


Ignore:
Timestamp:
Oct 2, 2008, 7:00:54 PM (11 years ago)
Author:
rgrieder
Message:
  • Modified cmake files to support library finding when using Visual Studio precompiled dependencies
  • Removed vorbisenc executable from library dependency
Location:
code/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/CMakeLists.txt

    r1871 r1872  
    66  cmake_policy(SET CMP0003 NEW)
    77ENDIF (COMMAND cmake_policy)
     8
     9# Allow for simple IF constructs (makes code a lot more readable)
     10#SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
    811
    912# This sets where to look for modules (e.g. "Find*.cmake" files)
     
    6871# SET (VERBOSE_FIND true)
    6972
     73# Set the library directory when using precompiled tarballs for the dependencies under windows
     74IF (WIN32)
     75  IF (MSVC)
     76    IF ($ENV{ORXONOX_DEV})
     77      SET (DEPENDENCY_DIR ${CMAKE_SOURCE_DIR}/../lib_dist/dependencies/)
     78    ELSE ($ENV{ORXONOX_DEV})
     79      SET (DEPENDENCY_DIR ${CMAKE_SOURCE_DIR}/dependencies/)
     80    ENDIF ($ENV{ORXONOX_DEV})
     81    SET(Boost_LIB_SUFFIX_DEBUG vc80-mt-gd-1_35)
     82  ENDIF (MSVC)
     83ENDIF (WIN32)
     84MESSAGE(STATUS ${DEPENDENCY_DIR})
     85
    7086# Performs the search and sets the variables
    7187FIND_PACKAGE(OGRE)
  • code/trunk/cmake/FindALUT.cmake

    r1776 r1872  
    4949  /opt/include
    5050  ../libs/freealut-1.1.0/include
     51  ${DEPENDENCY_DIR}/freealut-1.1.0/include
    5152  )
    5253
     
    8889    ../libs/freealut-1.1.0/src/.libs
    8990    ../libs/freealut-1.1.0/lib
     91    ${DEPENDENCY_DIR}/freealut-1.1.0/lib
    9092    )
    9193ENDIF(${ALUT_INCLUDE_DIR} MATCHES ".framework")
  • code/trunk/cmake/FindBoost.cmake

    r1776 r1872  
    11# THIS FILE HAS BEEN MODIFIED TO WORK ON THE TARDIS INFRASTURUCTURE of THE ETH.
    2 # use with cation
     2# use with caution
    33# Nicolas Schlumberger <nico AT orxonx DOT net> (C) 2007
    44#
     
    118118    ../libs/boost_1_34_1
    119119#    ../libs/boost-1_35_0
     120    ${DEPENDENCY_DIR}/boost-1.35.0/include
    120121
    121122# Help the user find it if we cannot.
     
    187188  mgw34-mt-1_34_1
    188189  mgw34-mt-1_35
     190  vc80-mt-1_35
     191  vc80-mt-gd-1_35
    189192)
    190193
     
    225228# For MSVC builds find debug library
    226229  IF(WIN32 AND MSVC AND Boost_${name}_LIBRARY)
    227     FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG})
     230    FIND_LIBRARY(Boost_${name}_LIBRARY_DEBUG
     231      NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX_DEBUG}
     232      PATHS ${Boost_LIBRARY_DIRS})
    228233
    229234    IF(MSVC_IDE)
  • code/trunk/cmake/FindCEGUI.cmake

    r1810 r1872  
    2626    FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
    2727        ../libs/cegui-0.6.1/include
     28        ${DEPENDENCY_DIR}/cegui-0.6.1/include
    2829    )
    2930
     
    3132    FIND_LIBRARY(CEGUI_LIBDIR NAMES ${CEGUI_LIBRARIES} PATHS
    3233        ../libs/cegui-0.6.1/bin
     34        ${DEPENDENCY_DIR}/cegui-0.6.1/lib
    3335    )
    3436
  • code/trunk/cmake/FindDirectX.cmake

    r1776 r1872  
    1717  FIND_PATH(DirectX_INCLUDE_DIR "dinput.h"
    1818    C:/DXSDK/Include
     19    $ENV{DXSDK_DIR}/Include
    1920  )
    2021
     
    2223    C:/DXSDK/Lib
    2324    C:/DXSDK/Lib/x86
     25    $ENV{DXSDK_DIR}/lib/x86
    2426  )
    2527
  • code/trunk/cmake/FindENet.cmake

    r1776 r1872  
    2222    /usr/pack/enet-2007-sd/include
    2323    ../libs/enet-1.1/include
     24    ${DEPENDENCY_DIR}/enet-1.2/include
    2425    )
    2526
     
    2829    PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/
    2930    ../libs/enet-1.1
     31    ${DEPENDENCY_DIR}/enet-1.2/lib
    3032    )
    3133
  • code/trunk/cmake/FindOGRE.cmake

    r1776 r1872  
    2222    FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
    2323        ../libs/ogre/OgreMain/include
     24        ${DEPENDENCY_DIR}/ogre-1.4.9/include
    2425    )
    2526
     
    2728    FIND_LIBRARY(OGRE_LIBDIR NAMES ${OGRE_LIBRARIES} PATHS
    2829        ../libs/ogre/Samples/Common/bin/Release
     30        ${DEPENDENCY_DIR}/ogre-1.4.9/lib
    2931    )
    3032
  • code/trunk/cmake/FindOggVorbis.cmake

    r1776 r1872  
    2929  /opt/include
    3030  ../libs/libogg-1.1.3/include
     31  ${DEPENDENCY_DIR}/libogg-1.1.3/include
    3132  )
    3233
     
    4142  /opt/include
    4243  ../libs/libvorbis-1.2.0/include
     44  ${DEPENDENCY_DIR}/libvorbis-1.2.0/include
    4345  )
    4446
     
    5860  /opt/lib
    5961  ../libs/libogg-1.1.3/src/.libs
     62  ${DEPENDENCY_DIR}/libogg-1.1.3/lib
    6063  )
    6164
     
    7174  /opt/lib
    7275  ../libs/libvorbis-1.2.0/lib/.libs
     76  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
    7377  )
    7478
    75 FIND_LIBRARY(VORBISENC_LIBRARY
    76   NAMES vorbisenc
    77   PATHS
    78   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    79   /usr/local/lib
    80   /usr/lib
    81   /sw/lib
    82   /opt/local/lib
    83   /opt/csw/lib
    84   /opt/lib
    85   ../libs/libvorbis-1.2.0/lib/.libs
    86   )
     79#FIND_LIBRARY(VORBISENC_LIBRARY
     80#  NAMES vorbisenc
     81#  PATHS
     82#  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
     83#  /usr/local/lib
     84#  /usr/lib
     85#  /sw/lib
     86#  /opt/local/lib
     87#  /opt/csw/lib
     88#  /opt/lib
     89#  ../libs/libvorbis-1.2.0/lib/.libs
     90#  )
    8791
    8892FIND_LIBRARY(VORBISFILE_LIBRARY
     
    97101  /opt/lib
    98102  ../libs/libvorbis-1.2.0/lib/.libs
     103  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
    99104  )
    100105
     
    123128SET (VORBIS_FOUND "NO")
    124129
    125 IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
     130IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
    126131  SET (VORBIS_FOUND "YES")
    127132  IF (NOT VORBIS_FIND_QUIETLY)
     
    130135      MESSAGE (STATUS "  include path: ${VORBIS_INCLUDE_DIR}")
    131136      MESSAGE (STATUS "  library path: ${VORBIS_LIBRARY}")
    132       MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
     137      #MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
    133138      MESSAGE (STATUS "  library path: ${VORBISFILE_LIBRARY}")
    134139      MESSAGE (STATUS "  libraries:    vorbis vorbisenc vorbisfile")
    135140    ENDIF (VERBOSE_FIND)
    136141  ENDIF (NOT VORBIS_FIND_QUIETLY)
    137 ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
     142ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
    138143  IF (NOT VORBIS_INCLUDE_DIR)
    139144    MESSAGE (SEND_ERROR "Vorbis include path was not found.")
     
    142147    MESSAGE (SEND_ERROR "Vorbis library \"vorbis\" was not found.")
    143148  ENDIF (NOT VORBIS_LIBRARY)
    144   IF (NOT VORBISENC_LIBRARY)
    145     MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
    146   ENDIF (NOT VORBISENC_LIBRARY)
     149  #IF (NOT VORBISENC_LIBRARY)
     150  #  MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
     151  #ENDIF (NOT VORBISENC_LIBRARY)
    147152  IF (NOT VORBISFILE_LIBRARY)
    148153    MESSAGE (SEND_ERROR "Vorbis library \"vorbisfile\" was not found.")
  • code/trunk/cmake/FindOpenAL.cmake

    r1776 r1872  
    4848  /opt/include
    4949  ../libs/openal-0.0.8/common/include
     50  ${DEPENDENCY_DIR}/openal-1.1/include
    5051  )
    5152# I'm not sure if I should do a special casing for Apple. It is
     
    8586    /opt/lib
    8687    ../libs/openal-0.0.8/src/.libs
     88    ${DEPENDENCY_DIR}/openal-1.1/lib
    8789    )
    8890ENDIF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
  • code/trunk/cmake/FindTCL.cmake

    r1776 r1872  
    3030  ../libs/tcl8.5.2/unix
    3131  ../libs/tcl8.5.2/macosx
     32  ${DEPENDENCY_DIR}/tcl-8.5.2/lib
    3233)
    3334
    3435FIND_LIBRARY(TCL_LIBRARY
    35   NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4
     36  NAMES tcl tcl85 tcl8.5 tcl84 tcl8.4 tcl85t
    3637  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
    3738)
     
    5758  /usr/include/tcl8.4
    5859  ../libs/tcl8.5.2/generic
     60  ${DEPENDENCY_DIR}/tcl-8.5.2/include
    5961)
    6062
  • code/trunk/cmake/FindZLIB.cmake

    r1776 r1872  
    3737  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
    3838    ../libs/zlib/include
     39    ${DEPENDENCY_DIR}/zlib-1.2.3/include
    3940  )
    4041
     
    4243    NAMES zlib
    4344    PATHS ${ZLIB_LIBRARY_DIR}
     45    ${DEPENDENCY_DIR}/zlib-1.2.3/lib
    4446  )
    4547ENDIF(WIN32)
Note: See TracChangeset for help on using the changeset viewer.