refs #5388. Should be leaner now.

mantidproject · May 23, 2012 · 1b7af15 · 1b7af15
1 parent 20e5f64
commit 1b7af15
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonVatesSetup.cmake b/Code/Mantid/Build/CMake/CommonVatesSetup.cmake
@@ -4,17 +4,11 @@ include ( SetMantidSubprojects )
 
 set_mantid_subprojects (
 Framework/API
-Framework/Crystal
-Framework/CurveFitting
 Framework/Geometry
 Framework/Kernel
-Framework/Algorithms
 Framework/DataObjects
-Framework/DataHandling
 Framework/MDEvents
 Framework/MDAlgorithms
-Framework/Nexus
-Framework/NexusCPP
 )
 
 set ( COMMONVATES_SETUP_DONE TRUE )
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.cxx
@@ -5,7 +5,6 @@
 #include "vtkUnstructuredGridAlgorithm.h"
 #include "vtkUnstructuredGrid.h"
 
-#include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/LoadMD.h"
 #include "MantidNexusCPP/NeXusException.hpp"
 #include "MantidVatesAPI/vtkSplatterPlotFactory.h"

diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx
@@ -11,12 +11,11 @@
 #include <vtkCubeSource.h>
 
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
-#include "MantidCrystal/LoadIsawPeaks.h"
 #include "MantidVatesAPI/vtkPeakMarkerFactory.h"
 #include "MantidAPI/Workspace.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-
+#include "MantidAPI/AlgorithmManager.h"
 #include <vtkPVGlyphFilter.h>
 
 vtkCxxRevisionMacro(vtkPeaksReader, "$Revision: 1.0 $");
@@ -106,7 +105,7 @@ int vtkPeaksReader::RequestInformation(
   if(!m_isSetup) 
   {
     // This actually loads the peaks file
-    Mantid::API::IAlgorithm_sptr alg(new Mantid::Crystal::LoadIsawPeaks());
+    Mantid::API::IAlgorithm_sptr alg = Mantid::API::AlgorithmManager::Instance().create("LoadIsawPeaks");
     alg->initialize();
     alg->setPropertyValue("Filename", this->FileName);
     alg->setPropertyValue("OutputWorkspace", "LoadedPeaksWS");

diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -171,17 +171,16 @@ target_link_libraries( VatesAPI
 ${MANTID_SUBPROJECT_LIBS} 
 vtkCommon 
 vtkFiltering
-Crystal
 )
 
 # Create test file projects
 if( CXXTEST_FOUND AND GMOCK_FOUND AND GTEST_FOUND )
-  include_directories( inc ../../Framework/TestHelpers/inc ../../Framework/DataHandling/inc)
+  include_directories( inc ../../Framework/TestHelpers/inc ../../Framework/DataHandling/inc ../../Framework/DataObjects/inc)
   set ( TESTHELPER_SRCS ../../Framework/TestHelpers/src/ComponentCreationHelper.cpp 
                         ../../Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
                         ../../Framework/TestHelpers/src/MDEventsTestHelper.cpp )
   cxxtest_add_test( VatesAPITest ${TEST_FILES} )
-  target_link_libraries( VatesAPITest VatesAPI DataHandling Kernel ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
+  target_link_libraries( VatesAPITest VatesAPI DataHandling Kernel DataObjects ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES} )
   add_dependencies( FrameworkTests VatesAPITest )
   # Add to the 'UnitTests' group in VS
   set_property ( TARGET VatesAPITest PROPERTY FOLDER "UnitTests" )