[Orxonox-commit 6481] r11127 - in code/branches/ogre1.9: cmake/tools src/orxonox

[landauf at orxonox.net]

Author: landauf
Date: 2016-02-21 23:15:03 +0100 (Sun, 21 Feb 2016)
New Revision: 11127

Modified:
   code/branches/ogre1.9/cmake/tools/FindOGRE.cmake
   code/branches/ogre1.9/src/orxonox/CMakeLists.txt
Log:
in ogre 1.9, overlays were moved into a separate component (i.e. a shared library called OgreOverlay) -> we have to find and link this library if ogre's version is >= 1.9

Modified: code/branches/ogre1.9/cmake/tools/FindOGRE.cmake
===================================================================
--- code/branches/ogre1.9/cmake/tools/FindOGRE.cmake	2016-02-21 21:21:46 UTC (rev 11126)
+++ code/branches/ogre1.9/cmake/tools/FindOGRE.cmake	2016-02-21 22:15:03 UTC (rev 11127)
@@ -37,19 +37,40 @@
 
 # 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
 # Also check the version requirements
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(OGRE DEFAULT_MSG ${OGRE_VERSION}
   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(
   OGRE_INCLUDE_DIR
   OGRE_LIBRARY_OPTIMIZED
   OGRE_LIBRARY_DEBUG
+  OGRE_OVERLAY_LIBRARY_OPTIMIZED
+  OGRE_OVERLAY_LIBRARY_DEBUG
 )

Modified: code/branches/ogre1.9/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/ogre1.9/src/orxonox/CMakeLists.txt	2016-02-21 21:21:46 UTC (rev 11126)
+++ code/branches/ogre1.9/src/orxonox/CMakeLists.txt	2016-02-21 22:15:03 UTC (rev 11127)
@@ -68,6 +68,7 @@
     OrxonoxPrecompiledHeaders.h
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
+    ${OGRE_OVERLAY_LIBRARY}
     ${CEGUI}
     ${LUA5.1_LIBRARY}
     ${CEGUI_TOLUA_LIBRARY}