Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1981


Ignore:
Timestamp:
Oct 20, 2008, 5:54:09 PM (16 years ago)
Author:
adrfried
Message:

tardis fixes

Location:
code/branches/buildsystem
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/CMakeLists.txt

    r1979 r1981  
    11PROJECT(Orxonox)
    22
    3 cmake_minimum_required(VERSION 2.4)
     3CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
    44
    55IF (COMMAND cmake_policy)
     
    6868#FIND_PACKAGE(CEGUI_OGRE REQUIRED)
    6969FIND_PACKAGE(ENet REQUIRED)
    70 FIND_PACKAGE(Boost REQUIRED thread filesystem)
     70FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
    7171FIND_PACKAGE(OpenAL REQUIRED)
    7272FIND_PACKAGE(ALUT REQUIRED)
     
    7676FIND_PACKAGE(DirectX REQUIRED)
    7777
    78 FIND_PACKAGE(Lua51)
     78IF(NOT IS_TARDIS)
     79  FIND_PACKAGE(Lua51 QUIET)
     80ENDIF(NOT IS_TARDIS)
    7981IF(NOT LUA_FOUND)
    8082  FIND_PACKAGE(Lua50 REQUIRED)
  • code/branches/buildsystem/cmake/CheckTardis.cmake

    r1977 r1981  
    3535IF (IS_TARDIS)
    3636  MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
    37   SET(CMAKE_C_COMPILER "gcc-4.1.1")
    38   SET(CMAKE_CXX_COMPILER "g++-4.1.1")
    39   SET(BOOST_ROOT "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1")
    40   SET($ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib")
     37  SET(CMAKE_C_COMPILER "gcc-4.2.2")
     38  SET(CMAKE_CXX_COMPILER "g++-4.2.2")
     39  #SET(BOOST_ROOT "/usr/pack/boost-1.36.0-sd/i686-debian-linux4.0")
     40  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.36.0-sd/include/boost-1_36/boost")
     41  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.36.0-sd/i686-debian-linux4.0/lib")
     42  SET(ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
    4143ENDIF (IS_TARDIS)
Note: See TracChangeset for help on using the changeset viewer.