Refs #6315. Moving to a central setup file.

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

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -73,7 +73,6 @@ 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.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.app" )
+set ( PARAVIEW_APP_DIR "/Applications/${OSX_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/Build/CMake/ParaViewSetup.cmake b/Code/Mantid/Build/CMake/ParaViewSetup.cmake
@@ -0,0 +1,7 @@
+# This file will setup some common items that later setups depend on
+
+# Set the version of ParaView that is compatible with the Mantid code base
+set ( COMPATIBLE_PARAVIEW_VERSION "3.98.1" )
+
+# Set the name of the OSX application as this tends to be different
+set ( OSX_PARAVIEW_APP "paraview.app" )
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -23,6 +23,11 @@ set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
 ###########################################################################
 find_package ( Qt4 COMPONENTS QtCore QtGui QtOpenGL QtXml QtSvg Qt3Support REQUIRED )
 
+###########################################################################
+# Set ParaView information since later items depend on it
+###########################################################################
+include ( ParaViewSetup )
+
 ###########################################################################
 # Set paths to Third_Party for Windows builds
 ###########################################################################

diff --git a/Code/Mantid/Framework/Kernel/src/ParaViewVersion.cpp.in b/Code/Mantid/Framework/Kernel/src/ParaViewVersion.cpp.in
@@ -10,7 +10,7 @@ namespace Kernel
 
 std::string ParaViewVersion::targetVersion()
 {
-  return "@Compatible_ParaView_Version@";
+  return "@COMPATIBLE_PARAVIEW_VERSION@";
 }
 
 } // namespace Kernel