Changeset 1810 for code/trunk/src/CMakeLists.txt

Timestamp:

Sep 21, 2008, 8:44:25 PM (16 years ago)

Author:

rgrieder

Message:

merged ceguilua branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/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)
 
+# 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)
+
+
+# Our own libraries
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)