[Orxonox-commit 3395] r8082 - code/branches/kicklib/cmake/tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-17 02:58:58 +0100 (Thu, 17 Mar 2011)
New Revision: 8082

Modified:
   code/branches/kicklib/cmake/tools/FindCEGUI.cmake
Log:
Make sure all required CEGUI extras are confirmed to be found by the CMake run.

Modified: code/branches/kicklib/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-17 01:28:23 UTC (rev 8081)
+++ code/branches/kicklib/cmake/tools/FindCEGUI.cmake	2011-03-17 01:58:58 UTC (rev 8082)
@@ -30,7 +30,7 @@
 INCLUDE(FindPackageHandleAdvancedArgs)
 INCLUDE(HandleLibraryTypes)
 
-# Find headers
+# Find CEGUI headers
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
@@ -53,6 +53,11 @@
   PATH_SUFFIXES lib bin
 )
 
+# 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
   NAMES CEGUILua CEGUILuaScriptModule
@@ -67,13 +72,13 @@
 
 # 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
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
@@ -90,6 +95,11 @@
 # Newer versions of CEGUI have the renderer for OGRE shipped with them
 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
     NAMES CEGUIOgreRenderer
@@ -101,7 +111,10 @@
     PATHS $ENV{CEGUIDIR}
     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)
 ENDIF()
@@ -111,10 +124,11 @@
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(CEGUI DEFAULT_MSG "${CEGUI_VERSION}"
   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}
 )
 
 # Collect optimized and debug libraries
@@ -129,11 +143,13 @@
   CEGUI_INCLUDE_DIR
   CEGUI_LIBRARY_OPTIMIZED
   CEGUI_LIBRARY_DEBUG
+  CEGUILUA_INCLUDE_DIR
   CEGUILUA_LIBRARY_OPTIMIZED
   CEGUILUA_LIBRARY_DEBUG
   CEGUI_TOLUA_INCLUDE_DIR
   CEGUI_TOLUA_LIBRARY_OPTIMIZED
   CEGUI_TOLUA_LIBRARY_DEBUG
+  CEGUI_OGRE_RENDERER_INCLUDE_DIR
   CEGUI_OGRE_RENDERER_LIBRARY_OPTIMIZED
   CEGUI_OGRE_RENDERER_LIBRARY_DEBUG
 )