Changeset 1981

Timestamp:

Oct 20, 2008, 5:54:09 PM (16 years ago)

Author:

adrfried

Message:

tardis fixes

Location:

code/branches/buildsystem

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/CheckTardis.cmake (modified) (1 diff)
• cmake/FindLua50.cmake (deleted)
• cmake/FindLua51.cmake (deleted)

code/branches/buildsystem/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-cmake_minimum_required(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
 
 IF (COMMAND cmake_policy)
@@ -68 +68 @@
 #FIND_PACKAGE(CEGUI_OGRE REQUIRED)
 FIND_PACKAGE(ENet REQUIRED)
-FIND_PACKAGE(Boost REQUIRED thread filesystem)
+FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
 FIND_PACKAGE(OpenAL REQUIRED)
 FIND_PACKAGE(ALUT REQUIRED)
@@ -76 +76 @@
 FIND_PACKAGE(DirectX REQUIRED)
 
-FIND_PACKAGE(Lua51)
+IF(NOT IS_TARDIS)
+  FIND_PACKAGE(Lua51 QUIET)
+ENDIF(NOT IS_TARDIS)
 IF(NOT LUA_FOUND)
   FIND_PACKAGE(Lua50 REQUIRED)

code/branches/buildsystem/cmake/CheckTardis.cmake

@@ -35 +35 @@
 IF (IS_TARDIS)
   MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
-  SET(CMAKE_C_COMPILER "gcc-4.1.1")
-  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
-  SET(BOOST_ROOT "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1")
-  SET($ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib")
+  SET(CMAKE_C_COMPILER "gcc-4.2.2")
+  SET(CMAKE_CXX_COMPILER "g++-4.2.2")
+  #SET(BOOST_ROOT "/usr/pack/boost-1.36.0-sd/i686-debian-linux4.0")
+  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.36.0-sd/include/boost-1_36/boost")
+  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.36.0-sd/i686-debian-linux4.0/lib")
+  SET(ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
 ENDIF (IS_TARDIS)