Changeset 11795 for code/branches/cegui0.8_ogre1.9/cmake/tools

Timestamp:

Feb 21, 2018, 12:03:52 AM (7 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• cmake/tools/FindCEGUI.cmake (modified) (1 diff)
• cmake/tools/FindOGRE.cmake (modified) (3 diffs)

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

@@ -39 +39 @@
 
 # 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)
 # Version 0.8 introduced a new directory and file naming convention
 IF(_version_0_8_compare GREATER -1)

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

@@ -38 +38 @@
 # Inspect OgrePrerquisites.h for the version number
 DETERMINE_VERSION(OGRE ${OGRE_INCLUDE_DIR}/OgrePrerequisites.h)
+COMPARE_VERSION_STRINGS("${OGRE_VERSION}" "1.9" _version_1_9_compare TRUE)
+# Version 1.9 moved overlays into a separate component (which means we must find and link to another library)
+IF(_version_1_9_compare GREATER -1)
+  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_OPTIMIZED
+    NAMES OgreOverlay
+    PATHS $ENV{OGRE_HOME}
+    PATH_SUFFIXES lib bin/Release bin/release Release release
+  )
+  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_DEBUG
+    NAMES OgreOverlayd OgreOverlay_d OgreOverlayD OgreOverlay_D
+    PATHS $ENV{OGRE_HOME}
+    PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
+  )
+  SET(OGRE_REQUIRED_VARIABLES
+    OGRE_OVERLAY_LIBRARY_OPTIMIZED
+  )
+ENDIF()
 
 # Handle the REQUIRED argument and set OGRE_FOUND
@@ -44 +61 @@
   OGRE_LIBRARY_OPTIMIZED
   OGRE_INCLUDE_DIR
+  ${OGRE_REQUIRED_VARIABLES}
 )
 
 # Collect optimized and debug libraries
 HANDLE_LIBRARY_TYPES(OGRE)
+HANDLE_LIBRARY_TYPES(OGRE_OVERLAY)
 
 MARK_AS_ADVANCED(
@@ -53 +72 @@
   OGRE_LIBRARY_OPTIMIZED
   OGRE_LIBRARY_DEBUG
+  OGRE_OVERLAY_LIBRARY_OPTIMIZED
+  OGRE_OVERLAY_LIBRARY_DEBUG
 )