Changeset 11211 for code/branches/ogre1.9/cmake/tools

Timestamp:

Jul 5, 2016, 11:46:10 PM (8 years ago)

Author:

bknecht

Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:

code/branches/ogre1.9

Files:

• . (modified) (1 prop)
• cmake/tools/FindCEGUI.cmake (modified) (5 diffs)

code/branches/ogre1.9/cmake/tools/FindCEGUI.cmake

@@ -32 +32 @@
 
 # Determine CEGUI's version
-FIND_FILE(CEGUI_VERSION_FILE CEGUIVersion.h Version.h
-  PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES include include/CEGUI
-)
+#FIND_FILE(CEGUI_VERSION_FILE Version.h
+#  PATHS $ENV{CEGUIDIR}
+#  PATH_SUFFIXES include include/CEGUI include/cegui-0.8.4/CEGUI
+#)
+file(GLOB CEGUI_VERSION_FILE "/usr/include/cegui-*/CEGUI/Version.h")
+message("Found File: " ${CEGUI_VERSION_FILE})
 DETERMINE_VERSION(CEGUI ${CEGUI_VERSION_FILE})
+message("Found Version: ${CEGUI_VERSION}")
 
 # Find CEGUI headers
-COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare TRUE)
+COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare)
+message("CEGUI Version: ${_version_0_8_compare}")
 # Version 0.8 introduced a new directory and file naming convention
 IF(_version_0_8_compare GREATER -1)
@@ -45 +49 @@
   FIND_PATH(CEGUI_INCLUDE_DIR CEGUI/CEGUI.h
     PATHS $ENV{CEGUIDIR}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES include/cegui-${CEGUI_VERSION}/
   )
 ELSE()
@@ -102 +106 @@
     # 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
+    #NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )
 # Find CEGUI Tolua++ libraries
@@ -118 +122 @@
 # Newer versions of CEGUI have the renderer for OGRE shipped with them
 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.7" _version_0_7_compare TRUE)
+message("another version: ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre")
 IF(_version_0_7_compare GREATER -1)
   # Find CEGUI OGRE Renderer headers
@@ -124 +129 @@
       $ENV{CEGUIDIR}
       $ENV{CEGUIOGRERENDERERDIR}
-      ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
+      ${CEGUI_INCLUDE_DIR}/CEGUI/RendererModules/Ogre
     PATH_SUFFIXES include include/CEGUI
   )