Refs #6315. Merging Mac fix.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398 Conflicts: Code/Mantid/Build/CMake/DarwinSetup.cmake
mantidproject · May 3, 2013 · 7464762 · 7464762
2 parents e02eeb3 + 2589d57
commit 7464762
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/Properties/Mantid.properties.template b/Code/Mantid/Framework/Properties/Mantid.properties.template
@@ -78,6 +78,11 @@ pythonalgorithms.refresh.allowed = 0
 # Use forward slash / for all paths
 datasearch.directories = @DATADIRS@
 
+# Path to the ParaView bin directory, i.e. the directory containing the paraview executable
+# Warning: Mantid is compiled against a specific version of ParaView. Ensure that this path
+# points to the ParaView obtained from the Mantid download page
+paraview.path = @PARAVIEW_APP_BIN_DIR@
+
 # Whether to look for ParaView (0 = try to use, 1 = don't use).
 paraview.ignore = @IGNORE_PARAVIEW@