refs #4318. Fix dynamic loading of wrong libraries.

mantidproject · Dec 13, 2011 · 8491b88 · 8491b88
1 parent e71079a
commit 8491b88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Code/Mantid/MantidQt/API/src/InterfaceManager.cpp b/Code/Mantid/MantidQt/API/src/InterfaceManager.cpp
@@ -161,7 +161,11 @@ InterfaceManagerImpl::InterfaceManagerImpl()
       g_log.error() << "MANTIDPARAVIEWPATH env variable defined, but libraries cannot be loaded"
         << std::endl;
     }
-  } 
+  }
+  else
+  {
+    g_log.information("No Vates libraries to load.");
+  }
 }
 
 /// Destructor

diff --git a/Code/Mantid/Vates/CMakeLists.txt b/Code/Mantid/Vates/CMakeLists.txt
@@ -93,7 +93,7 @@ if( ParaView_FOUND AND USE_PARAVIEW )
 		Push \\\"MANTIDPARAVIEWPATH\\\"
         Push \\\"A\\\"
         Push \\\"HKCU\\\"
-        Push \\\"$INSTDIR\\\\bin\\\"
+        Push \\\"$INSTDIR\\\\plugins\\\"
         Call EnvVarUpdate
         Pop  \\\$0
 		
@@ -131,7 +131,7 @@ if( ParaView_FOUND AND USE_PARAVIEW )
 		Push \\\"MANTIDPARAVIEWPATH\\\"
         Push \\\"R\\\"
         Push \\\"HKCU\\\"
-        Push \\\"$INSTDIR\\\\bin\\\"
+        Push \\\"$INSTDIR\\\\plugins\\\"
         Call un.EnvVarUpdate
         Pop  \\\$0
 		")