Changeset 2509 for code/branches/buildsystem2/src/CMakeLists.txt

Timestamp:

Dec 17, 2008, 8:59:48 PM (17 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(.)
-INCLUDE_DIRECTORIES(..)
-INCLUDE_DIRECTORIES(orxonox)
+# Set the search paths for include files
+INCLUDE_DIRECTORIES(
+  ${OGRE_INCLUDE_DIR}
+  ${CEGUI_INCLUDE_DIR}
+#  ${CEGUI_OGRE_INCLUDE_DIR}
+  ${ENet_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
+  ${OPENAL_INCLUDE_DIR}
+  ${ALUT_INCLUDE_DIR}
+  ${VORBIS_INCLUDE_DIR}
+  ${OGG_INCLUDE_DIR}
+  ${LUA_INCLUDE_DIR}
+  ${TCL_INCLUDE_PATH}
+  ${DirectX_INCLUDE_DIR}
+  ${ZLIB_INCLUDE_DIR}
+)
+
+INCLUDE_DIRECTORIES(
+  .
+  ois
+  orxonox
+  tolua
+  # Required for tolua bind files that are in the build folder
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# Set special macro symbols across all libraries
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_TICPP")
 
 ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
-ADD_SUBDIRECTORY(lua)
 ADD_SUBDIRECTORY(tolua)
 
+# TODO: write include file for this stuff
 # 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
@@ -18 +43 @@
     INCLUDE_DIRECTORIES(ceguilua-0.6.1)
 ELSE (WIN32)
-    IF (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
-    ELSE (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
-    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
+    # FIXME
+    #IF (${CEGUI_VERSION} LESS 0.6.0)
+        ADD_SUBDIRECTORY(ceguilua-0.5.0/ceguilua)
+        INCLUDE_DIRECTORIES(ceguilua-0.5.0)
+    #ELSE (${CEGUI_VERSION} LESS 0.6.0)
+    #    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
+    #    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+    #ENDIF (${CEGUI_VERSION} LESS 0.6.0)
 ENDIF (WIN32)