Correction for PV_PLUGIN_PATH. Refs #5379

It should point to the sub-directory.
mantidproject · May 24, 2012 · 6a612b5 · 6a612b5
1 parent 6bc1fa4
commit 6a612b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/Kernel/CMakeLists.txt b/Code/Mantid/Framework/Kernel/CMakeLists.txt
@@ -363,7 +363,7 @@ if ( ${CMAKE_PROJECT_NAME} STREQUAL "MantidFramework" )
 endif ()
 
 set ( PLUGINS "." )
-set ( PV_PLUGINS "./pvplugins/pvplugins" )
+set ( PV_PLUGINS "./pvplugins" )
 set ( QTPLUGINS "." )
 set ( PYTHONALGS ${MANTID_ROOT}/Framework/PythonAPI/PythonAlgorithms )
 set ( DATADIRS ${MANTID_ROOT}/../../Test/AutoTestData;${MANTID_ROOT}/instrument )

diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1303,7 +1303,7 @@ void ConfigServiceImpl::setParaViewPluginPath() const
       g_log.debug("No ParaView plugin directory specified in the properties file.");
       return; // it didn't work
     }
-    pv_plugin_path = Poco::Path(user_loc);
+    pv_plugin_path = Poco::Path(user_loc, "pvplugins");
     pv_plugin_path = pv_plugin_path.absolute();
     pv_plugin = Poco::File(pv_plugin_path.toString());
     if (!pv_plugin.exists() || !pv_plugin.isDirectory())