Changeset 11798

Timestamp:

Feb 22, 2018, 12:20:34 PM (7 years ago)

Author:

landauf

Message:

added (again) more include paths to make it work with ubuntu

File:

• code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake (modified) (4 diffs)

code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake

@@ -34 +34 @@
 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})
@@ -45 +48 @@
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
     PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES
+      include
+      include/cegui-${CEGUI_VERSION}/
   )
 ELSE()
@@ -102 +107 @@
     # 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
@@ -125 +129 @@
       $ENV{CEGUIOGRERENDERERDIR}
       ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
+      ${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre
     PATH_SUFFIXES include include/CEGUI
   )