Changeset 1999

Timestamp:

Oct 22, 2008, 5:05:23 PM (16 years ago)

Author:

adrfried

Message:

works on tardis again, finally

Location:

code/branches/buildsystem

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/CheckTardis.cmake (modified) (1 diff)
• cmake/FindENet.cmake (modified) (1 diff)
• cmake/FindOpenAL.cmake (deleted)
• cmake/FindPkgConfig.cmake (deleted)
• cmake/FindTCL.cmake (deleted)
• cmake/FindZLIB.cmake (deleted)

code/branches/buildsystem/CMakeLists.txt

@@ -66 +66 @@
 FIND_PACKAGE(OGRE REQUIRED)
 FIND_PACKAGE(CEGUI REQUIRED)
+# CEGUI_OGRE included in source
 #FIND_PACKAGE(CEGUI_OGRE REQUIRED)
 FIND_PACKAGE(ENet REQUIRED)
@@ -75 +76 @@
 FIND_PACKAGE(TCL REQUIRED)
 FIND_PACKAGE(DirectX REQUIRED)
-
-IF(NOT IS_TARDIS)
-  FIND_PACKAGE(Lua51 QUIET)
-ENDIF(NOT IS_TARDIS)
-IF(NOT LUA_FOUND)
-  FIND_PACKAGE(Lua50 REQUIRED)
-ENDIF(NOT LUA_FOUND)
+FIND_PACKAGE(Lua50 REQUIRED)
+#FIND_PACKAGE(Lua51 QUIET)
 
 # Add main source dir

code/branches/buildsystem/cmake/CheckTardis.cmake

@@ -34 +34 @@
 IF (IS_TARDIS)
   MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
-  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(CMAKE_C_COMPILER "gcc-4.1")
+  SET(CMAKE_CXX_COMPILER "g++-4.1")
+  #SET(Boost_ADDITIONAL_VERSIONS "1.36")
+  SET(BOOST_INCLUDEDIR "/usr/pack/boost-1.34.1-sd/include")
+  SET(BOOST_LIBRARYDIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/lib")
   SET(ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd;/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1")
   SET(ENV{ALUTDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
+  SET(ENV{OPENALDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
+  #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
 ENDIF (IS_TARDIS)

code/branches/buildsystem/cmake/FindENet.cmake

@@ -20 +20 @@
     /usr/include
     /usr/local/include
-    /usr/pack/enet-2007-sd/include
+    /usr/pack/enet-2007-sd/include # Tardis specific hack
     ../libs/enet-1.1/include
     ${DEPENDENCY_DIR}/enet-1.2/include