refs #5103. For windows DataHandling goes to plugins

mantidproject · Apr 20, 2012 · 78e3357 · 78e3357
1 parent 9b41ab2
commit 78e3357
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/API/src/FrameworkManager.cpp b/Code/Mantid/Framework/API/src/FrameworkManager.cpp
@@ -71,17 +71,17 @@ FrameworkManagerImpl::FrameworkManagerImpl() : g_log(Kernel::Logger::get("Framew
     const std::string pvPluginDir = config.getString("pvplugins.directory");
     if (pvPluginDir.length() > 0)
     {
-      this->g_log.information("Loading PV plugin libraries");
+      this->g_log.debug("Loading PV plugin libraries");
       Mantid::Kernel::LibraryManager::Instance().OpenAllLibraries(pvPluginDir, false);
     }
     else
     {
-      this->g_log.information("No PV plugin library directory");
+      this->g_log.notice("No PV plugin library directory");
     }
   }
   else
   {
-    this->g_log.information("Cannot load paraview libraries");
+    this->g_log.debug("Cannot load paraview libraries");
   }
 
   // Disable reporting errors from Nexus (they clutter up the output).

diff --git a/Code/Mantid/Framework/DataObjects/CMakeLists.txt b/Code/Mantid/Framework/DataObjects/CMakeLists.txt
@@ -131,5 +131,10 @@ endif ()
 # Installation settings
 ###########################################################################
 
-# This MUST go to here rather than plugins for the Mac install to work
-install ( TARGETS DataObjects DESTINATION ${LIB_DIR} )
+if ( WIN32 )
+  install ( TARGETS DataObjects DESTINATION ${PLUGINS_DIR} )
+else()
+  install ( TARGETS DataObjects DESTINATION ${LIB_DIR} )
+endif ()
+
+
diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1743,11 +1743,11 @@ bool ConfigServiceImpl::quickParaViewCheck() const
   const bool ignoreParaview = hasProperty(paraviewIgnoreProperty) && atoi(getString(paraviewIgnoreProperty).c_str());
   if(ignoreParaview)
   {
-    this->g_log.information("Ignoring ParaView");
+    this->g_log.debug("Ignoring ParaView");
     return false;
   }
 
-  this->g_log.information("Checking for ParaView");
+  this->g_log.debug("Checking for ParaView");
   bool isAvailable = false;
 
   try
@@ -1771,7 +1771,7 @@ bool ConfigServiceImpl::quickParaViewCheck() const
   }
   catch(Poco::SystemException &e)
   {
-    g_log.notice(e.what());
+    g_log.debug(e.what());
     this->g_log.notice("ParaView is not available");
   }
   return isAvailable;