Changeset 1643 for code/branches/gui

Timestamp:

Jul 23, 2008, 3:40:23 PM (16 years ago)

Author:

rgrieder

Message:

removed the comment characters for CEGUI dependency in CMLs
(CEGUI_OGRE is still commented, since I had to compile that into our own executable)

Location:

code/branches/gui

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/gui/CMakeLists.txt

@@ -63 +63 @@
 #Performs the search and sets the variables
 FIND_PACKAGE(OGRE)
-# FIND_PACKAGE(CEGUI)
+FIND_PACKAGE(CEGUI)
 # FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
@@ -78 +78 @@
 LINK_DIRECTORIES(
   ${OGRE_LIB_DIR}
-#  ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR}
+  ${CEGUI_LIB_DIR} # ${CEGUI_OGRE_LIB_DIR}
   ${ENet_LIBRARY}
   ${Boost_LIBRARY_DIRS}
@@ -88 +88 @@
 INCLUDE_DIRECTORIES(
   ${OGRE_INCLUDE_DIR}
-#  ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
+  ${CEGUI_INCLUDE_DIR} # ${CEGUI_OGRE_INCLUDE_DIR}
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}

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

@@ -88 +88 @@
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
+  ${CEGUI_LIBRARIES}
   tinyxml
   tolualib