[Orxonox-commit 4494] r9165 - code/trunk/cmake/tools

rgrieder at orxonox.net rgrieder at orxonox.net
Wed May 9 09:13:13 CEST 2012


Author: rgrieder
Date: 2012-05-09 09:13:13 +0200 (Wed, 09 May 2012)
New Revision: 9165

Modified:
   code/trunk/cmake/tools/CheckOGREPlugins.cmake
Log:
Fixed OGRE plugin finding for Ubuntu precise. Untested!

Modified: code/trunk/cmake/tools/CheckOGREPlugins.cmake
===================================================================
--- code/trunk/cmake/tools/CheckOGREPlugins.cmake	2012-05-08 19:35:36 UTC (rev 9164)
+++ code/trunk/cmake/tools/CheckOGREPlugins.cmake	2012-05-09 07:13:13 UTC (rev 9165)
@@ -51,12 +51,12 @@
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_OPTIMIZED
       NAMES ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin Ogre.framework/Resources i386-linux-gnu/OGRE-1.7.4
+      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin Ogre.framework/Resources OGRE-${OGRE_VERSION}
     )
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
       NAMES ${_plugin}d ${_plugin}_d ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin Ogre.framework/Resources
+      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin Ogre.framework/Resources OGRE-${OGRE_VERSION}
     )
     # We only need at least one render system. Check at the end.
     IF(NOT ${_plugin} MATCHES "RenderSystem")




More information about the Orxonox-commit mailing list