Changeset 8082

Timestamp:

Mar 17, 2011, 2:58:58 AM (13 years ago)

Author:

rgrieder

Message:

Make sure all required CEGUI extras are confirmed to be found by the CMake run.

File:

• code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) (8 diffs)

code/branches/kicklib/cmake/tools/FindCEGUI.cmake

@@ -31 +31 @@
 INCLUDE(HandleLibraryTypes)
 
-# Find headers
+# Find CEGUI headers
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
@@ -54 +54 @@
 )
 
+# Find CEGUILua headers
+FIND_PATH(CEGUILUA_INCLUDE_DIR CEGUILua.h
+  PATHS $ENV{CEGUIDIR} ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
+  PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+)
 # Find CEGUILua libraries
 FIND_LIBRARY(CEGUILUA_LIBRARY_OPTIMIZED
@@ -68 +73 @@
 # Find CEGUI Tolua++ include file
 # We only need to add this path since we use tolua++ like a normal
-# dependency but it is shipped with CEGUI.
+# dependency but it is shipped with CEGUILua.
 FIND_PATH(CEGUI_TOLUA_INCLUDE_DIR tolua++.h
   PATHS
-    ${CEGUI_INCLUDE_DIR}
+    ${CEGUILUA_INCLUDE_DIR}
     # For newer CEGUI versions >= 0.7
-    ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule/support/tolua++
-  NO_DEFAULT_PATH # Has to be in a CEGUI_INCLUDE_DIR somewhere
+    ${CEGUILUA_INCLUDE_DIR}/support/tolua++
+  NO_DEFAULT_PATH # MUST be in CEGUILUA_INCLUDE_DIR somewhere
 )
 # Find CEGUI Tolua++ libraries
@@ -91 +96 @@
 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_compare TRUE)
 IF(_version_compare GREATER -1)
+  # Find CEGUI OGRE Renderer headers
+  FIND_PATH(CEGUI_OGRE_RENDERER_INCLUDE_DIR CEGUIOgreRenderer.h
+    PATHS $ENV{CEGUIDIR} ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
+    PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+  )
   # Find CEGUI OGRE Renderer libraries
   FIND_LIBRARY(CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
@@ -102 +112 @@
     PATH_SUFFIXES lib bin
   )
-  SET(CEGUI_OGRE_RENDERER_LIBRARY_NAME CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED)
+  SET(CEGUI_OGRE_RENDERER_REQUIRED_VARIABLES
+    CEGUI_OGRE_RENDERER_INCLUDE_DIR
+    CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
+  )
 ELSE()
   SET(CEGUI_OGRE_RENDERER_BUILD_REQUIRED TRUE)
@@ -112 +125 @@
   CEGUI_INCLUDE_DIR
   CEGUI_LIBRARY_OPTIMIZED
+  CEGUILUA_INCLUDE_DIR
   CEGUILUA_LIBRARY_OPTIMIZED
   CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
-  ${CEGUI_OGRE_RENDERER_LIBRARY_NAME}
+  ${CEGUI_OGRE_RENDERER_REQUIRED_VARIABLES}
 )
 
@@ -130 +144 @@
   CEGUI_LIBRARY_OPTIMIZED
   CEGUI_LIBRARY_DEBUG
+  CEGUILUA_INCLUDE_DIR
   CEGUILUA_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_DEBUG
@@ -135 +150 @@
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   CEGUI_TOLUA_LIBRARY_DEBUG
+  CEGUI_OGRE_RENDERER_INCLUDE_DIR
   CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
   CEGUI_OGRE_RENDERER_LIBRARY_DEBUG