Changeset 1977 for code/branches/buildsystem/src

Timestamp:

Oct 20, 2008, 5:53:30 PM (16 years ago)

Author:

adrfried

Message:

further cleanup

Location:

code/branches/buildsystem/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/src/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(.)
-INCLUDE_DIRECTORIES(..)
-INCLUDE_DIRECTORIES(ois) # for ois library subfolders
-INCLUDE_DIRECTORIES(orxonox)
-#INCLUDE_DIRECTORIES(lua) # for tolua library and generator
-INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
+# 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}
+)
+
+# Set the search paths for the linking
+LINK_DIRECTORIES(
+  ${OGRE_LIB_DIR}
+  ${CEGUI_LIB_DIR}
+#  ${CEGUI_SCRIPT_LIB_DIR}
+#  ${CEGUI_OGRE_LIB_DIR}
+  ${ENet_LIBRARY}
+  ${Boost_LIBRARY_DIRS}
+  ${Zlib_LIBRARY_DIR}
+  ${TCL_LIBRARY}
+)
+
+INCLUDE_DIRECTORIES(
+  .
+  ..
+  ois
+  orxonox
+)
 
 ADD_SUBDIRECTORY(cpptcl)
@@ -12 +41 @@
 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

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

@@ -59 +59 @@
 TARGET_LINK_LIBRARIES(core
   ${OGRE_LIBRARIES}
-  ${Boost_thread_LIBRARIES}
-  ${Boost_filesystem_LIBRARIES}
+  ${Boost_THREAD_LIBRARY}
+  ${Boost_FILESYSTEM_LIBRARY}
   ${LUA_LIBRARIES}
   cpptcl_orxonox

code/branches/buildsystem/src/network/CMakeLists.txt

@@ -28 +28 @@
   ${ZLIB_LIBRARY}
   ${ENet_LIBRARY}
-  ${Boost_thread_LIBRARIES}
+  ${Boost_THREAD_LIBRARY}
   core
 )

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

@@ -98 +98 @@
   ${CEGUI_LIBRARIES}
   ${LUA_LIBRARIES}
+  # TODO: write include file for this
   CEGUILuaScriptModule
   tinyxml_orxonox