Fixed CMake problem with Ogre plugins path

13 years ago · 7bf8497215
parent efe3a3fcbe
commit 7bf8497215
2 changed files with 3 additions and 3 deletions
--- a/cmake/FindOGRE.cmake
+++ b/cmake/FindOGRE.cmake
@ -444,9 +444,9 @@ macro(ogre_find_plugin PLUGIN HEADER)
          PATH_SUFFIXES "" bin bin/debug debug)
      elseif (UNIX)
        get_filename_component(OGRE_PLUGIN_DIR_TMP ${OGRE_${PLUGIN}_LIBRARY_REL} PATH)
-        set(OGRE_PLUGIN_DIR_REL ${OGRE_PLUGIN_DIR_TMP} CACHE STRING "Ogre plugin dir (release)")
+        set(OGRE_PLUGIN_DIR_REL ${OGRE_PLUGIN_DIR_TMP} CACHE STRING "Ogre plugin dir (release)" FORCE)
        get_filename_component(OGRE_PLUGIN_DIR_TMP ${OGRE_${PLUGIN}_LIBRARY_DBG} PATH)
-        set(OGRE_PLUGIN_DIR_DBG ${OGRE_PLUGIN_DIR_TMP} CACHE STRING "Ogre plugin dir (debug)")
+        set(OGRE_PLUGIN_DIR_DBG ${OGRE_PLUGIN_DIR_TMP} CACHE STRING "Ogre plugin dir (debug)" FORCE)
      endif ()
    endif ()
 	
--- a/files/plugins.cfg.linux
+++ b/files/plugins.cfg.linux
@ -1,7 +1,7 @@
 # Defines plugins to load

 # Define plugin folder
-PluginFolder=${OGRE_PLUGIN_DIR}
+PluginFolder=${OGRE_PLUGIN_DIR_REL}

 # Define plugins
 Plugin=RenderSystem_GL