Changeset 1808 for code/branches

Timestamp:

Sep 21, 2008, 8:30:03 PM (16 years ago)

Author:

rgrieder

Message:

Minor changes with cmake files. The whole thing compiles on tardis now

Location:

code/branches/ceguilua/src

Files:

• CMakeLists.txt (modified) (1 diff)
• ceguilua-0.5.0b/ceguilua/CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)

code/branches/ceguilua/src/CMakeLists.txt

@@ -2 +2 @@
 INCLUDE_DIRECTORIES(..)
 INCLUDE_DIRECTORIES(orxonox)
-#INCLUDE_DIRECTORIES(tolua)
 
 ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
+ADD_SUBDIRECTORY(lua)
+ADD_SUBDIRECTORY(tolua)
 
-# This section deals with Lua version problems because CEGUILua scripting
-# module for CEGUI also uses Lua, but maybe with a different version.
+# Some people may not have CEGUILua installed, espc. with version 0.5
+# And we don't know what lua version it was linked against, so we compile
+# it ourselves.
 # So first, find out what CEGUI version we have.
+IF (${CEGUI_VERSION} LESS 0.6.0)
+    ADD_SUBDIRECTORY(ceguilua-0.5.0b)
+    INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
+ELSE (${CEGUI_VERSION} LESS 0.6.0)
+    ADD_SUBDIRECTORY(ceguilua-0.6.1)
+    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+ENDIF (${CEGUI_VERSION} LESS 0.6.0)
 
 
-ADD_SUBDIRECTORY(tolua)
-
+# Our own libraries
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/CMakeLists.txt

@@ -8 +8 @@
 )
 
-ADD_LIBRARY( ceguilua_orxonox SHARED ${LUA_SRC_FILES} )
+ADD_LIBRARY( ceguilua_orxonox SHARED ${CEGUILUA_SRC_FILES} )
 
 TARGET_LINK_LIBRARIES( ceguilua_orxonox lua_orxonox )

code/branches/ceguilua/src/core/CMakeLists.txt

@@ -54 +54 @@
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc

code/branches/ceguilua/src/orxonox/CMakeLists.txt

@@ -66 +66 @@
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
@@ -98 +98 @@
   ${OGRE_LIBRARIES}
   ${CEGUI_LIBRARIES}
-  ${CEGUI_SCRIPT_LIBRARIES}
   lua_orxonox
+  ceguilua_orxonox
   tinyxml_orxonox
   tolualib_orxonox