Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 17, 2008, 8:59:48 PM (16 years ago)
Author:
rgrieder
Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:
code/branches/buildsystem2
Files:
8 deleted
7 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem2

  • code/branches/buildsystem2/cmake/CheckTardis.cmake

    r1505 r2509  
    66# only run this test on a lunix/unix machine
    77IF (UNIX)
    8 
    98  FIND_PROGRAM(UNAME_CMD "uname"
    109  PATHS "/usr/bin /bin")
    … …  
    3029
    3130ENDIF (UNIX)
     31
     32MARK_AS_ADVANCED(IS_TARDIS)
     33
     34IF (IS_TARDIS)
     35  MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
     36  SET(CMAKE_C_COMPILER "gcc-4.1")
     37  SET(CMAKE_CXX_COMPILER "g++-4.1")
     38  #SET(Boost_ADDITIONAL_VERSIONS "1.36")
     39  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.34.1-sd/include")
     40  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib")
     41  SET(ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
     42  SET(ENV{ALUTDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
     43  SET(ENV{OPENALDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
     44  SET(ENV{ENETDIR} "/usr/pack/enet-2007-sd;/usr/pack/enet-2007-sd/i686-debian-linux3.1")
     45  SET(ENV{OGGVORBISDIR} "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
     46  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
     47  SET(ENV{CEGUIDIR} "/usr/pack/cegui-0.5.0-sd;/usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1")
     48  SET(ENV{OGREDIR} "/usr/pack/ogre-1.4.5-sd;/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1")
     49ENDIF (IS_TARDIS)
     50
     51MARK_AS_ADVANCED(UNAME_CMD IS_TARDIS)

  • code/branches/buildsystem2/cmake/FindALUT.cmake

    r1872 r2509  
    1818#
    1919# Several changes and additions by Fabian 'x3n' Landau
     20# Some simplifications by Adrian Friedli
    2021#                 > www.orxonox.net <
    2122
    22 IF (ALUT_LIBRARY AND ALUT_INCLUDE_DIR)
    23   SET (ALUT_FIND_QUIETLY TRUE)
    24 ENDIF (ALUT_LIBRARY AND ALUT_INCLUDE_DIR)
    25 
    2623FIND_PATH(ALUT_INCLUDE_DIR AL/alut.h
    27   $ENV{ALUTDIR}/include
    28   ~/Library/Frameworks/OpenAL.framework/Headers
    29   /Library/Frameworks/OpenAL.framework/Headers
    30   /System/Library/Frameworks/OpenAL.framework/Headers # Tiger
    31   /usr/pack/openal-0.0.8-cl/include # Tardis specific hack
    32   /usr/local/include/
    33   /usr/local/include/OpenAL
    34   /usr/local/include
    35   /usr/include/
    36   /usr/include/OpenAL
    37   /usr/include
    38   /sw/include/ # Fink
    39   /sw/include/OpenAL
    40   /sw/include
    41   /opt/local/include/AL # DarwinPorts
    42   /opt/local/include/OpenAL
    43   /opt/local/include
    44   /opt/csw/include/ # Blastwave
    45   /opt/csw/include/OpenAL
    46   /opt/csw/include
    47   /opt/include/
    48   /opt/include/OpenAL
    49   /opt/include
    50   ../libs/freealut-1.1.0/include
    51   ${DEPENDENCY_DIR}/freealut-1.1.0/include
     24  PATHS
     25  $ENV{ALUTDIR}
     26  ~/Library/Frameworks/OpenAL.framework
     27  /Library/Frameworks/OpenAL.framework
     28  /System/Library/Frameworks/OpenAL.framework # Tiger
     29  /usr/local
     30  /usr
     31  /sw # Fink
     32  /opt/local # DarwinPorts
     33  /opt/csw # Blastwave
     34  /opt
     35  PATH_SUFFIXES include include/OpenAL include/AL Headers
    5236  )
    5337
    … …  
    7862    NAMES alut
    7963    PATHS
    80     $ENV{ALUTDIR}/lib
    81     $ENV{ALUTDIR}/libs
    82     /usr/pack/openal-0.0.8-cl/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/freealut-1.1.0/src/.libs
    90     ../libs/freealut-1.1.0/lib
    91     ${DEPENDENCY_DIR}/freealut-1.1.0/lib
     64    $ENV{ALUTDIR}
     65    /usr/local
     66    /usr
     67    /sw
     68    /opt/local
     69    /opt/csw
     70    /opt
     71    PATH_SUFFIXES lib libs
    9272    )
    9373ENDIF(${ALUT_INCLUDE_DIR} MATCHES ".framework")
    9474
    95 SET (ALUT_FOUND "NO")
    96 IF (ALUT_LIBRARY AND ALUT_INCLUDE_DIR)
    97   SET (ALUT_FOUND "YES")
    98   IF (NOT ALUT_FIND_QUIETLY)
    99     MESSAGE (STATUS "FreeAlut was found.")
    100     IF (VERBOSE_FIND)
    101       MESSAGE (STATUS "  include path: ${ALUT_INCLUDE_DIR}")
    102       MESSAGE (STATUS "  library path: ${ALUT_LIBRARY}")
    103       MESSAGE (STATUS "  libraries:    alut")
    104     ENDIF (VERBOSE_FIND)
    105   ENDIF (NOT ALUT_FIND_QUIETLY)
    106 ELSE (ALUT_LIBRARY AND ALUT_INCLUDE_DIR)
    107   IF (NOT ALUT_INCLUDE_DIR)
    108     MESSAGE (SEND_ERROR "FreeAlut include path was not found.")
    109   ENDIF (NOT ALUT_INCLUDE_DIR)
    110   IF (NOT ALUT_LIBRARY)
    111     MESSAGE (SEND_ERROR "FreeAlut library was not found.")
    112   ENDIF (NOT ALUT_LIBRARY)
    113 ENDIF (ALUT_LIBRARY AND ALUT_INCLUDE_DIR)
     75# handle the QUIETLY and REQUIRED arguments and set ALUT_FOUND to TRUE if
     76# all listed variables are TRUE
     77INCLUDE(FindPackageHandleStandardArgs)
     78FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG ALUT_LIBRARY ALUT_INCLUDE_DIR)
    11479
    115 
     80MARK_AS_ADVANCED(ALUT_LIBRARY ALUT_INCLUDE_DIR)

  • code/branches/buildsystem2/cmake/FindCEGUI.cmake

    r1872 r2509  
    33# This module defines
    44#  CEGUI_INCLUDE_DIR
    5 #  CEGUI_LIBRARIES, the libraries to link against to use CEGUI.
    6 #  CEGUI_LIB_DIR, the location of the libraries
     5#  CEGUI_LIBRARY, the library to link against to use CEGUI.
    76#  CEGUI_FOUND, If false, do not try to use CEGUI
    87#
    … …  
    1716#
    1817# Several changes and additions by Fabian 'x3n' Landau
     18# Lots of simplifications by Adrian Friedli
    1919#                 > www.orxonox.net <
    2020
    21 IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    22     SET(CEGUI_FIND_QUIETLY TRUE) # Already in cache, be silent
    23 ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
     21# TODO: Determine CEGUI version
    2422
    25 IF (WIN32) #Windows
    26     FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
    27         ../libs/cegui-0.6.1/include
    28         ${DEPENDENCY_DIR}/cegui-0.6.1/include
    29     )
     23FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
     24    PATHS
     25    $ENV{CEGUIDIR}
     26    /usr/local
     27    /usr
     28    PATH_SUFFIXES include include/CEGUI
     29)
    3030
    31     SET(CEGUI_LIBRARIES debug CEGUIBase_d optimized CEGUIBase)
    32     FIND_LIBRARY(CEGUI_LIBDIR NAMES ${CEGUI_LIBRARIES} PATHS
    33         ../libs/cegui-0.6.1/bin
    34         ${DEPENDENCY_DIR}/cegui-0.6.1/lib
    35     )
    36 
    37     # Strip the filename from the path
    38     IF (CEGUI_LIBDIR)
    39         GET_FILENAME_COMPONENT(CEGUI_LIBDIR ${CEGUI_LIBDIR} PATH)
    40         SET (CEGUI_LIB_DIR ${CEGUI_LIBDIR} CACHE FILEPATH "")
    41     ENDIF (CEGUI_LIBDIR)
     31#SET(CEGUI_LIBRARIES debug CEGUIBase_d optimized CEGUIBase)
     32FIND_LIBRARY(CEGUI_LIBRARY
     33    NAMES CEGUIBase
     34    PATHS
     35    $ENV{CEGUIDIR}
     36    /usr/local
     37    /usr
     38    PATH_SUFFIXES lib
     39)
    4240
    4341#    IF (NOT CEGUI_SCRIPT_LIBDIR)
    … …  
    5856#    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    5957
    60 #    # Strip the filename from the path
    61 #    IF (CEGUI_SCRIPT_LIBDIR)
    62 #        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
    63 #        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
    64 #    ENDIF (CEGUI_SCRIPT_LIBDIR)
     58INCLUDE(FindPackageHandleStandardArgs)
     59FIND_PACKAGE_HANDLE_STANDARD_ARGS(CEGUI DEFAULT_MSG
     60    CEGUI_LIBRARY
     61    CEGUI_INCLUDE_DIR
     62    #CEGUI_SCRIPT_LIBRARIES
     63)
    6564
    66 ELSE (WIN32) #Unix
    67     FIND_PACKAGE(PkgConfig)
    68     PKG_SEARCH_MODULE(CEGUI CEGUI /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI.pc) # tardis specific hack
    69     SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIRS})
    70     SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
    71     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    72 #    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
    73 #    SET(CEGUI_SCRIPT_LIB_DIR)
    74 ENDIF (WIN32)
    75 
    76 IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    77     SET(CEGUI_FOUND TRUE)
    78 
    79     #Do some preparation
    80     SEPARATE_ARGUMENTS(CEGUI_INCLUDE_DIR)
    81     SEPARATE_ARGUMENTS(CEGUI_LIBRARIES)
    82 
    83     SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIR} CACHE PATH "")
    84     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    85     SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
    86 #    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
    87 ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    88 
    89 IF (CEGUI_FOUND)
    90     IF (NOT CEGUI_FIND_QUIETLY)
    91         MESSAGE(STATUS "CEGUI was found.")
    92         IF (VERBOSE_FIND)
    93             MESSAGE (STATUS "  include path: ${CEGUI_INCLUDE_DIR}")
    94             MESSAGE (STATUS "  library path: ${CEGUI_LIB_DIR}")
    95             MESSAGE (STATUS "  libraries:    ${CEGUI_LIBRARIES}")
    96 #            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
    97         ENDIF (VERBOSE_FIND)
    98     ENDIF (NOT CEGUI_FIND_QUIETLY)
    99 ELSE (CEGUI_FOUND)
    100     IF (NOT CEGUI_INCLUDE_DIR)
    101         MESSAGE(SEND_ERROR "CEGUI include path was not found.")
    102     ENDIF (NOT CEGUI_INCLUDE_DIR)
    103     IF (NOT CEGUI_LIB_DIR)
    104         MESSAGE(SEND_ERROR "CEGUI library was not found.")
    105     ENDIF (NOT CEGUI_LIB_DIR)
    106     IF (NOT CEGUI_LIBRARIES)
    107         MESSAGE(SEND_ERROR "CEGUI libraries not known.")
    108     ENDIF (NOT CEGUI_LIBRARIES)
    109 #    IF (NOT CEGUI_SCRIPT_LIBRARIES)
    110 #        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
    111 #    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
    112 ENDIF (CEGUI_FOUND)
    113 
     65MARK_AS_ADVANCED(
     66    CEGUI_LIBRARY
     67    CEGUI_INCLUDE_DIR
     68    #CEGUI_SCRIPT_LIBRARIES
     69)

  • code/branches/buildsystem2/cmake/FindENet.cmake

    r1872 r2509  
    33#
    44#  ENET_FOUND - system has enet
    5 #  ENET_INCLUDE_DIR - the enet include directory
    6 #  ENET_LIBRARIES - the libraries needed to use enet
    7 #  ENET_DEFINITIONS - Compiler switches required for using enet
     5#  ENet_INCLUDE_DIR - the enet include directory
     6#  ENet_LIBRARIES - the libraries needed to use enet
     7#
     8# $ENETDIR is an environment variable used for finding enet.
    89#
    910#  Borrowed from The Mana World
    … …  
    1112#
    1213# Several changes and additions by Fabian 'x3n' Landau
     14# Lots of simplifications by Adrian Friedli
    1315#                 > www.orxonox.net <
    1416
    15 IF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
    16    SET(ENet_FIND_QUIETLY TRUE)
    17 ENDIF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
    18 
    1917FIND_PATH(ENet_INCLUDE_DIR enet/enet.h
    20     /usr/include
    21     /usr/local/include
    22     /usr/pack/enet-2007-sd/include
    23     ../libs/enet-1.1/include
    24     ${DEPENDENCY_DIR}/enet-1.2/include
     18    PATHS
     19    $ENV{ENETDIR}
     20    /usr/local
     21    /usr
     22    PATH_SUFFIXES include
    2523    )
    2624
    2725FIND_LIBRARY(ENet_LIBRARY
    2826    NAMES enet
    29     PATHS /usr/lib /usr/local/lib /usr/pack/enet-2007-sd/i686-debian-linux3.1/lib/
    30     ../libs/enet-1.1
    31     ${DEPENDENCY_DIR}/enet-1.2/lib
     27    PATHS
     28    $ENV{ENETDIR}
     29    /usr/local
     30    /usr
     31    PATH_SUFFIXES lib
    3232    )
    3333
    34 SET(ENET_FOUND FALSE)
    35 IF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
    36     SET(ENET_FOUND TRUE)
    37     SET(ENET_INCLUDE_DIR ${ENet_INCLUDE_DIR})
     34# handle the QUIETLY and REQUIRED arguments and set ENET_FOUND to TRUE if
     35# all listed variables are TRUE
     36INCLUDE(FindPackageHandleStandardArgs)
     37FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENet DEFAULT_MSG ENet_LIBRARY ENet_INCLUDE_DIR)
    3838
     39IF (ENET_FOUND)
    3940    IF(WIN32)
    4041        SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
    41         SET(ENet_LIBRARY ${ENet_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
     42        SET(ENet_LIBRARIES ${ENet_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
     43    ELSE(WIN32)
     44        SET(ENet_LIBRARIES ${ENet_LIBRARY})
    4245    ENDIF(WIN32)
    43 
    44     SET(ENET_LIBRARIES ${ENet_LIBRARY})
    45 ENDIF (ENet_INCLUDE_DIR AND ENet_LIBRARY)
    46 
    47 IF (ENET_FOUND)
    48     IF (NOT ENet_FIND_QUIETLY)
    49         MESSAGE(STATUS "ENet was found.")
    50         IF (VERBOSE_FIND)
    51             MESSAGE (STATUS "  include path: ${ENet_INCLUDE_DIR}")
    52             MESSAGE (STATUS "  library path: ${ENet_LIBRARY}")
    53             MESSAGE (STATUS "  libraries:    enet")
    54         ENDIF (VERBOSE_FIND)
    55     ENDIF (NOT ENet_FIND_QUIETLY)
    56 ELSE (ENET_FOUND)
    57     IF (NOT ENet_INCLUDE_DIR)
    58         MESSAGE(SEND_ERROR "ENet include path was not found.")
    59     ENDIF (NOT ENet_INCLUDE_DIR)
    60     IF (NOT ENet_LIBRARY)
    61         MESSAGE(SEND_ERROR "ENet library was not found.")
    62     ENDIF (NOT ENet_LIBRARY)
    6346ENDIF (ENET_FOUND)
    6447
    65 MARK_AS_ADVANCED(ENet_INCLUDE_DIR ENet_LIBRARY)
     48MARK_AS_ADVANCED(ENet_LIBRARY ENet_INCLUDE_DIR)

  • code/branches/buildsystem2/cmake/FindOGRE.cmake

    r1872 r2509  
    33# This module defines
    44#  OGRE_INCLUDE_DIR
    5 #  OGRE_LIBRARIES, the libraries to link against to use OGRE.
    6 #  OGRE_LIB_DIR, the location of the libraries
     5#  OGRE_LIBRARY, the library to link against to use OGRE.
    76#  OGRE_FOUND, If false, do not try to use OGRE
    87#
    … …  
    1312#
    1413# Several changes and additions by Fabian 'x3n' Landau
     14# Lots of simplifications by Adrian Friedli
    1515#                 > www.orxonox.net <
    1616
    17 IF (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR AND OGRE_LIB_DIR)
    18     SET (OGRE_FIND_QUIETLY TRUE) # Already in cache, be silent
    19 ENDIF (OGRE_LIBRARIES AND OGRE_INCLUDE_DIR AND OGRE_LIB_DIR)
     17FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
     18    PATHS
     19    $ENV{OGREDIR}
     20    /usr/local
     21    /usr
     22    PATH_SUFFIXES include include/OGRE
     23)
    2024
    21 IF (WIN32) #Windows
    22     FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
    23         ../libs/ogre/OgreMain/include
    24         ${DEPENDENCY_DIR}/ogre-1.4.9/include
    25     )
     25#SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
     26FIND_LIBRARY(OGRE_LIBRARY
     27    NAMES OgreMain
     28    PATHS
     29    $ENV{OGREDIR}
     30    /usr/local
     31    /usr
     32    PATH_SUFFIXES lib
     33)
    2634
    27     SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
    28     FIND_LIBRARY(OGRE_LIBDIR NAMES ${OGRE_LIBRARIES} PATHS
    29         ../libs/ogre/Samples/Common/bin/Release
    30         ${DEPENDENCY_DIR}/ogre-1.4.9/lib
    31     )
     35INCLUDE(FindPackageHandleStandardArgs)
     36FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGRE DEFAULT_MSG
     37    OGRE_LIBRARY
     38    OGRE_INCLUDE_DIR
     39)
    3240
    33     # Strip the filename from the path
    34     IF (OGRE_LIBDIR)
    35         GET_FILENAME_COMPONENT(OGRE_LIBDIR ${OGRE_LIBDIR} PATH)
    36         SET (OGRE_LIB_DIR ${OGRE_LIBDIR} CACHE FILEPATH "")
    37     ENDIF (OGRE_LIBDIR)
    38 ELSE (WIN32) #Unix
    39     FIND_PACKAGE(PkgConfig)
    40     PKG_SEARCH_MODULE(OGRE OGRE /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/pkgconfig/OGRE.pc) # tardis specific hack
    41     SET(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIRS})
    42     SET(OGRE_LIB_DIR ${OGRE_LIBDIR})
    43     SET(OGRE_LIBRARIES ${OGRE_LIBRARIES})
    44 ENDIF (WIN32)
    45 
    46 #Do some preparation
    47 SEPARATE_ARGUMENTS(OGRE_INCLUDE_DIR)
    48 SEPARATE_ARGUMENTS(OGRE_LIBRARIES)
    49 
    50 SET (OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} CACHE PATH "")
    51 SET (OGRE_LIBRARIES ${OGRE_LIBRARIES} CACHE STRING "")
    52 SET (OGRE_LIB_DIR ${OGRE_LIB_DIR} CACHE PATH "")
    53 
    54 IF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES AND OGRE_LIB_DIR)
    55     SET(OGRE_FOUND TRUE)
    56 ENDIF (OGRE_INCLUDE_DIR AND OGRE_LIBRARIES AND OGRE_LIB_DIR)
    57 
    58 IF (OGRE_FOUND)
    59     IF (NOT OGRE_FIND_QUIETLY)
    60         MESSAGE(STATUS "Ogre was found.")
    61         IF (VERBOSE_FIND)
    62             MESSAGE (STATUS "  include path: ${OGRE_INCLUDE_DIR}")
    63             MESSAGE (STATUS "  library path: ${OGRE_LIB_DIR}")
    64             MESSAGE (STATUS "  libraries:    ${OGRE_LIBRARIES}")
    65         ENDIF (VERBOSE_FIND)
    66     ENDIF (NOT OGRE_FIND_QUIETLY)
    67 ELSE (OGRE_FOUND)
    68     IF (NOT OGRE_INCLUDE_DIR)
    69         MESSAGE(SEND_ERROR "Ogre include path was not found.")
    70     ENDIF (NOT OGRE_INCLUDE_DIR)
    71     IF (NOT OGRE_LIB_DIR)
    72         MESSAGE(SEND_ERROR "Ogre library was not found.")
    73     ENDIF (NOT OGRE_LIB_DIR)
    74     IF (NOT OGRE_LIBRARIES)
    75         MESSAGE(SEND_ERROR "Ogre libraries not known.")
    76     ENDIF (NOT OGRE_LIBRARIES)
    77 ENDIF (OGRE_FOUND)
     41MARK_AS_ADVANCED(
     42    OGRE_LIBRARY
     43    OGRE_INCLUDE_DIR
     44)

  • code/branches/buildsystem2/cmake/FindOggVorbis.cmake

    r1873 r2509  
     1# - Try to find ogg/vorbis
     2# Once done this will define
     3#
     4#  OGG_FOUND - system has ogg
     5#  OGG_INCLUDE_DIR
     6#  OGG_LIBRARY
     7#  VORBIS_FOUND - system has vorbis
     8#  VORBIS_INCLUDE_DIR
     9#  VORBIS_LIBRARY
     10#  VORBISENC_LIBRARY
     11#  VORBISFILE_LIBRARY
     12#
     13# $OGGVORBISDIR is an environment variable used for finding ogg/vorbis.
     14#
    115# Several changes and additions by Fabian 'x3n' Landau
     16# Most of all rewritten by Adrian Friedli
    217#                 > www.orxonox.net <
    318
    4 IF (OGG_INCLUDE_DIR AND OGG_LIBRARY)
    5   SET(OGG_FIND_QUIETLY TRUE)
    6 ENDIF (OGG_INCLUDE_DIR AND OGG_LIBRARY)
    7 
    8 IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
    9   SET(VORBIS_FIND_QUIETLY TRUE)
    10 ENDIF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
    11 
    12 
    13 #SET(OGGVORBIS_LIBRARY_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/lib")
    14 #SET(OGGVORBIS_LIBRARY "-L ${OGGVORBIS_LIBRARY_DIR} -lvorbisenc -lvorbisfile -logg -lvorbis ")
    15 #SET(OGGVORBIS_INCLUDE_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include")
    16 
    17 #
    18 # Includes
    19 #
     19SET(OGG_SEARCH_PATHS
     20  $ENV{OGGVORBISDIR}
     21  /usr/local
     22  /usr
     23  /sw
     24  /opt/local
     25  /opt/csw
     26  /opt
     27)
    2028
    2129FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h
    22   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include               # Tardis specific hack
    23   /usr/local/include
    24   /usr/include
    25   /sw/include
    26   /opt/local/include
    27   /opt/csw/include
    28   /opt/csw/include
    29   /opt/include
    30   ../libs/libogg-1.1.3/include
    31   ${DEPENDENCY_DIR}/libogg-1.1.3/include
    32   )
     30  PATHS ${OGG_SEARCH_PATHS}
     31  PATH_SUFFIXES include
     32)
    3333
    3434FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
    35   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include               # Tardis specific hack
    36   /usr/local/include
    37   /usr/include
    38   /sw/include
    39   /opt/local/include
    40   /opt/csw/include
    41   /opt/csw/include
    42   /opt/include
    43   ../libs/libvorbis-1.2.0/include
    44   ${DEPENDENCY_DIR}/libvorbis-1.2.0/include
    45   )
     35  PATHS ${OGG_SEARCH_PATHS}
     36  PATH_SUFFIXES include
     37)
    4638
    47 #
    48 # Libs
    49 #
     39FIND_LIBRARY(OGG_LIBRARY NAMES ogg
     40  PATHS ${OGG_SEARCH_PATHS}
     41  PATH_SUFFIXES lib
     42)
    5043
    51 FIND_LIBRARY(OGG_LIBRARY
    52   NAMES ogg
    53   PATHS
    54   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    55   /usr/local/lib
    56   /usr/lib
    57   /sw/lib
    58   /opt/local/lib
    59   /opt/csw/lib
    60   /opt/lib
    61   ../libs/libogg-1.1.3/src/.libs
    62   ${DEPENDENCY_DIR}/libogg-1.1.3/lib
    63   )
     44FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis
     45  PATHS ${OGG_SEARCH_PATHS}
     46  PATH_SUFFIXES lib
     47)
    6448
    65 FIND_LIBRARY(VORBIS_LIBRARY
    66   NAMES vorbis
    67   PATHS
    68   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    69   /usr/local/lib
    70   /usr/lib
    71   /sw/lib
    72   /opt/local/lib
    73   /opt/csw/lib
    74   /opt/lib
    75   ../libs/libvorbis-1.2.0/lib/.libs
    76   ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
    77   )
     49#FIND_LIBRARY(VORBISENC_LIBRARY NAMES vorbisenc
     50#  PATHS ${OGG_SEARCH_PATHS}
     51#  PATH_SUFFIXES lib
     52#)
    7853
    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 #  )
     54FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile
     55  PATHS ${OGG_SEARCH_PATHS}
     56  PATH_SUFFIXES lib
     57)
    9158
    92 FIND_LIBRARY(VORBISFILE_LIBRARY
    93   NAMES vorbisfile
    94   PATHS
    95   /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
    96   /usr/local/lib
    97   /usr/lib
    98   /sw/lib
    99   /opt/local/lib
    100   /opt/csw/lib
    101   /opt/lib
    102   ../libs/libvorbis-1.2.0/lib/.libs
    103   ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
    104   )
     59# handle the QUIETLY and REQUIRED arguments and set *_FOUND to TRUE if
     60# all listed variables are TRUE
     61INCLUDE(FindPackageHandleStandardArgs)
     62FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
     63FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG
     64  VORBIS_LIBRARY
     65  VORBISFILE_LIBRARY
     66  #VORBISENC_LIBRARY
     67  VORBIS_INCLUDE_DIR
     68)
    10569
    106 SET (OGG_FOUND "NO")
    107 
    108 IF (OGG_INCLUDE_DIR AND OGG_LIBRARY)
    109   SET (OGG_FOUND "YES")
    110   IF (NOT OGG_FIND_QUIETLY)
    111     MESSAGE (STATUS "Ogg was found.")
    112     IF (VERBOSE_FIND)
    113       MESSAGE (STATUS "  include path: ${OGG_INCLUDE_DIR}")
    114       MESSAGE (STATUS "  library path: ${OGG_LIBRARY}")
    115       MESSAGE (STATUS "  libraries:    ogg")
    116     ENDIF (VERBOSE_FIND)
    117   ENDIF (NOT OGG_FIND_QUIETLY)
    118 ELSE (OGG_INCLUDE_DIR AND OGG_LIBRARY)
    119   IF (NOT OGG_INCLUDE_DIR)
    120     MESSAGE (SEND_ERROR "Ogg include path was not found.")
    121   ENDIF (NOT OGG_INCLUDE_DIR)
    122   IF (NOT OGG_LIBRARY)
    123     MESSAGE (SEND_ERROR "Ogg library was not found.")
    124   ENDIF (NOT OGG_LIBRARY)
    125 ENDIF (OGG_INCLUDE_DIR AND OGG_LIBRARY)
    126 
    127 
    128 SET (VORBIS_FOUND "NO")
    129 
    130 IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
    131   SET (VORBIS_FOUND "YES")
    132   IF (NOT VORBIS_FIND_QUIETLY)
    133     MESSAGE (STATUS "Vorbis was found.")
    134     IF (VERBOSE_FIND)
    135       MESSAGE (STATUS "  include path: ${VORBIS_INCLUDE_DIR}")
    136       MESSAGE (STATUS "  library path: ${VORBIS_LIBRARY}")
    137       #MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
    138       MESSAGE (STATUS "  library path: ${VORBISFILE_LIBRARY}")
    139       MESSAGE (STATUS "  libraries:    vorbis vorbisenc vorbisfile")
    140     ENDIF (VERBOSE_FIND)
    141   ENDIF (NOT VORBIS_FIND_QUIETLY)
    142 ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
    143   IF (NOT VORBIS_INCLUDE_DIR)
    144     MESSAGE (SEND_ERROR "Vorbis include path was not found.")
    145   ENDIF (NOT VORBIS_INCLUDE_DIR)
    146   IF (NOT VORBIS_LIBRARY)
    147     MESSAGE (SEND_ERROR "Vorbis library \"vorbis\" was not found.")
    148   ENDIF (NOT VORBIS_LIBRARY)
    149   #IF (NOT VORBISENC_LIBRARY)
    150   #  MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
    151   #ENDIF (NOT VORBISENC_LIBRARY)
    152   IF (NOT VORBISFILE_LIBRARY)
    153     MESSAGE (SEND_ERROR "Vorbis library \"vorbisfile\" was not found.")
    154   ENDIF (NOT VORBISFILE_LIBRARY)
    155 ENDIF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
    156 
     70MARK_AS_ADVANCED(
     71  OGG_LIBRARY
     72  OGG_INCLUDE_DIR
     73  VORBIS_LIBRARY
     74  VORBISFILE_LIBRARY
     75  VORBIS_INCLUDE_DIR
     76)
Note: See TracChangeset for help on using the changeset viewer.