From 7bf8497215a53202947b9906f6924d324ab4d12d Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Tue, 7 Feb 2012 21:41:08 +0100 Subject: [PATCH] Fixed CMake problem with Ogre plugins path --- cmake/FindOGRE.cmake | 4 ++-- files/plugins.cfg.linux | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindOGRE.cmake b/cmake/FindOGRE.cmake index bf1ff30264..01fb04ac19 100644 --- 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 () diff --git a/files/plugins.cfg.linux b/files/plugins.cfg.linux index b6e104351d..3781f48e07 100644 --- 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