Changeset 113 for code/trunk

Timestamp:

Oct 27, 2007, 11:35:38 PM (17 years ago)

Author:

anonymous

Message:

nicolasc: some modification, removed cegui-opengl as it is not working

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• cmake/FindCEGUI_OGRE.cmake (modified) (1 diff)
• cmake/FindCEGUI_OPENGL.cmake (deleted)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/CMakeLists.txt

@@ -41 +41 @@
 FIND_PACKAGE(OIS)
 FIND_PACKAGE(CEGUI)
-FIND_PACKAGE(CEGUI_OPENGL)
+#FIND_PACKAGE(CEGUI_OPENGL)
 FIND_PACKAGE(CEGUI_OGRE)
 
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR})
 #Sets the search path for include files
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR})
 
 #add main source dir

code/trunk/cmake/FindCEGUI.cmake

@@ -25 +25 @@
 ELSE (WIN32) #Unix
     FIND_PACKAGE(PkgConfig)
-    PKG_SEARCH_MODULE(CEGUI CEGUI CEGUI-OPENGL /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI.pc /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI_OPENGL.pc) # tardis specific hack
+    PKG_SEARCH_MODULE(CEGUI CEGUI /usr/pack/cegui-0.5.0-sd/i686-debian-linux3.1/lib/pkgconfig/CEGUI.pc) # tardis specific hack
     SET(CEGUI_INCLUDE_DIR ${CEGUI_INCLUDE_DIRS})
     SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})

code/trunk/cmake/FindCEGUI_OGRE.cmake

@@ -2 +2 @@
 #
 # This module defines
-#  CEGUI_CEGUI_OGRE_INCLUDE_DIR
+#  CEGUI_OGRE_INCLUDE_DIR
 #  CEGUI_OGRE_LIBRARIES, the libraries to link against to use CEGUI_OGRE.
 #  CEGUI_OGRE_LIB_DIR, the location of the libraries

code/trunk/src/CMakeLists.txt

@@ -8 +8 @@
 ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
 #Links the executable against OGRE and OIS
-TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES})
-
+TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})