Refs #6315. Changing version numbers and executable name.

mantidproject · Apr 8, 2013 · 1d2ed70 · 1d2ed70
1 parent e139202
commit 1d2ed70
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -73,7 +73,7 @@ set ( CMAKE_INCLUDE_PATH ${MAIN_CMAKE_INCLUDE_PATH} )
 set ( MtdVersion_WC_LAST_CHANGED_REV 0 )
 set ( MtdVersion_WC_LAST_CHANGED_DATE Unknown )
 set ( NOT_GIT_REPO "Not" )
-set ( Compatible_ParaView_Version "3.10" )
+set ( Compatible_ParaView_Version "3.98.1" )
 
 find_package ( Git )
 if ( GIT_FOUND )

diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake
@@ -48,7 +48,7 @@ endif()
 set ( CMAKE_INSTALL_PREFIX /Applications )
 set ( INBUNDLE MantidPlot.app/ )
 # We know exactly where this has to be on Darwin
-set ( PARAVIEW_APP_DIR "/Applications/ParaView 3.10.1.app" )
+set ( PARAVIEW_APP_DIR "/Applications/paraview.app" )
 set ( PARAVIEW_APP_BIN_DIR "${PARAVIEW_APP_DIR}/Contents/MacOS" )
 set ( PARAVIEW_APP_LIB_DIR "${PARAVIEW_APP_DIR}/Contents/Libraries" )
 

diff --git a/Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp b/Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp
@@ -32,7 +32,7 @@ bool isParaviewHere(const QString& location)
     {
       it.next();
       QString file =it.fileName();
-      regex expression("^(pqcore)", boost::regex::icase);
+      regex expression("^(vtkpqcore)", boost::regex::icase);
       if(regex_search(file.toStdString(), expression) && it.fileInfo().isFile())
       {
         found = true;
@@ -54,7 +54,7 @@ SetUpParaview::SetUpParaview(StartUpFrom from, QWidget *parent) : QDialog(parent
   //Do our best to figure out the location based on where paraview normally sits.
   if(m_candidateLocation.isEmpty())
   {
-    const QString predictedLocation = "C:/Program Files (x86)/ParaView 3.10.1/bin";
+    const QString predictedLocation = "C:/Program Files (x86)/ParaView 3.98.1/bin";
     if(isParaviewHere(predictedLocation))
     {
       acceptPotentialLocation(predictedLocation);