Building: avoid full rebuild when changing YAF_RUNTIME_SEARCH_PLUGIN_…

…DIR CMake variable

CMakeConfig/templates/yaf_version.h.cmake

@@ -5,7 +5,10 @@
 // the intention is to link the YafaRay Core version to the git information obtained, for example with:
 // cmake /yafaray/src/Core -DYAFARAY_CORE_VERSION=`git --git-dir=/yafaray/src/Core/.git --work-tree=/yafaray/src/Core describe --dirty --always --tags --long`
 
+// This file is now also used to store the runtime search path for the plugins, if needed
+
 #ifndef Y_VERSION_H
 #define Y_VERSION_H
 #define YAFARAY_CORE_VERSION "@YAFARAY_CORE_VERSION@@DEBUG@"
+#define YAF_RUNTIME_SEARCH_PLUGIN_DIR "@YAF_RUNTIME_SEARCH_PLUGIN_DIR@"
 #endif

CMakeConfig/templates/yafray_config.h.cmake

@@ -5,8 +5,6 @@
 #include <core_api/color_console.h>
 #include <core_api/session.h>
 
-#define YAF_RUNTIME_SEARCH_PLUGIN_DIR "@YAF_RUNTIME_SEARCH_PLUGIN_DIR@"
-
 #define MIN_RAYDIST @YAF_MIN_RAY_DIST@
 #define YAF_SHADOW_BIAS @YAF_SHADOW_BIAS@
 

include/core_api/session.h

@@ -66,6 +66,7 @@ class YAFRAYCORE_EXPORT session_t
 		float currentPassPercent();
 		bool isInteractive();
 		std::string getPathYafaRayXml();
+		std::string getConfiguredRuntimeSearchPathYafaRayPlugins();
 		std::string getPathImageOutput();
 		std::string getYafaRayCoreVersion();
 

src/yafraycore/environment.cc

@@ -186,7 +186,7 @@ bool renderEnvironment_t::getPluginPath(std::string &path)
 	}
 
 	// If the previous checks do not work, check if the plugins path is in the plugins search directory defined in CMake during the building process
-	path = std::string(YAF_RUNTIME_SEARCH_PLUGIN_DIR);
+	path = std::string(session.getConfiguredRuntimeSearchPathYafaRayPlugins());
 	if ( boost::filesystem::exists( path ) )
 	{
 		Y_VERBOSE_ENV << "Plugins path found: '" << path << "'" << yendl;

src/yafraycore/session.cc

@@ -195,6 +195,11 @@ std::string session_t::getPathYafaRayXml()
 	return mPathYafaRayXml;
 }
 
+std::string session_t::getConfiguredRuntimeSearchPathYafaRayPlugins()
+{
+	return YAF_RUNTIME_SEARCH_PLUGIN_DIR;
+}
+
 std::string session_t::getPathImageOutput()
 {
 	if(mPathImageOutput.empty())