[Orxonox-commit 7181] r11798 - code/branches/cegui0.8_ogre1.9/cmake/tools

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-22 12:20:34 +0100 (Thu, 22 Feb 2018)
New Revision: 11798

Modified:
   code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake
Log:
added (again) more include paths to make it work with ubuntu

Modified: code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake
===================================================================
--- code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake	2018-02-22 00:03:44 UTC (rev 11797)
+++ code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake	2018-02-22 11:20:34 UTC (rev 11798)
@@ -33,7 +33,10 @@
 # Determine CEGUI's version
 FIND_FILE(CEGUI_VERSION_FILE CEGUIVersion.h Version.h
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES include include/CEGUI
+  PATH_SUFFIXES
+    include
+    include/CEGUI
+    include/cegui-0.8.4/CEGUI
 )
 DETERMINE_VERSION(CEGUI ${CEGUI_VERSION_FILE})
 
@@ -44,7 +47,9 @@
   # 0.8 and newer
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
     PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES
+      include
+      include/cegui-${CEGUI_VERSION}/
   )
 ELSE()
   # 0.7 and older
@@ -101,7 +106,6 @@
     ${DEP_INCLUDE_DIR}/tolua++/include
     # For Mac OS X, tolua++ is a separate framework in the dependency package
     ${DEP_FRAMEWORK_DIR}
-  NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )
 # Find CEGUI Tolua++ libraries
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
@@ -124,6 +128,7 @@
       $ENV{CEGUIDIR}
       $ENV{CEGUIOGRERENDERERDIR}
       ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
+      ${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre
     PATH_SUFFIXES include include/CEGUI
   )
   # Find CEGUI OGRE Renderer libraries