From dacea7a6fb337bce11972cca0bd1cef457628594 Mon Sep 17 00:00:00 2001
From: Martin Beaudoin <beaudoin.martin@ireq.ca>
Date: Thu, 4 Jul 2013 20:22:32 -0400
Subject: [PATCH] ThirdParty packages: switching to ParaView-3.14.1

---
 ThirdParty/AllMake.stage4                      |  4 ++--
 ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec | 10 ++++++++++
 ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec | 16 ++++++++++++----
 etc/settings.sh                                |  4 ++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4
index 9b18907a1..f415401a8 100755
--- a/ThirdParty/AllMake.stage4
+++ b/ThirdParty/AllMake.stage4
@@ -73,8 +73,8 @@ then
 
     if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
     then
-        ( rpm_make -p ParaView-3.12.0 -s ParaView-3.12.0.spec -u http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz \
-            -a --define='_qmakePath $QT_BIN_DIR/qmake'
+        ( rpm_make -p ParaView-3.14.1 -s ParaView-3.14.1.spec -u http://www.paraview.org/files/v3.14/ParaView-3.14.1-Source.tar.gz \
+            -f --define='_qmakePath $QT_BIN_DIR/qmake'
         )
     else
         echo "WARNING: "
diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
index 8b67a5fd8..ff4ed5e64 100644
--- a/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.12.0.spec
@@ -168,6 +168,16 @@ Patch1:         paraview-gcc47.patch
 
     echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
 
+%ifos darwin
+    # For Mac OSX:
+    # The configuration of Paraview will be using the environment variable MACOSX_DEPLOYMENT_TARGET.
+    # This variable was initialized using 'sw_vers -productVersion' in etc/bashrc.
+    # We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
+    v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
+    export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
+    echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}"
+%endif
+
     mkdir -p ./buildObj
     cd ./buildObj
 
diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec
index 8aa19740a..34d58d329 100644
--- a/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.14.1.spec
@@ -157,15 +157,13 @@ Patch2:                 ParaView-3.14.1.patch_darwin
     # start with these general settings
     addCMakeVariable  VTK_USE_TK:BOOL=OFF
     addCMakeVariable  PARAVIEW_ENABLE_PYTHON:BOOL=ON
-    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON  VTK_USE_RPATH:BOOL=OFF
+    addCMakeVariable  PARAVIEW_USE_MPI:BOOL=ON
+    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON
     addCMakeVariable  CMAKE_BUILD_TYPE:STRING=Release
 
     # include development files in "make install"
     addCMakeVariable  PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON
 
-    # new alternative to "make HTMLDocumentation"
-    addCMakeVariable  PARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=OFF
-
  %ifos darwin
     # Additional installation rules for Mac OS X
     addCMakeVariable  PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}-Source/Applications/ParaView-3.14.1_extra_install_Darwin.cmake
@@ -176,6 +174,16 @@ Patch2:                 ParaView-3.14.1.patch_darwin
 
     echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
 
+%ifos darwin
+    # For Mac OSX:
+    # The configuration of Paraview will be using the environment variable MACOSX_DEPLOYMENT_TARGET.
+    # This variable was initialized using 'sw_vers -productVersion' in etc/bashrc.
+    # We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
+    v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
+    export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
+    echo "Resetting MACOSX_DEPLOYMENT_TARGET to ${MACOSX_DEPLOYMENT_TARGET}"
+%endif
+
     mkdir -p ./buildObj
     cd ./buildObj
 
diff --git a/etc/settings.sh b/etc/settings.sh
index c7beab3b0..b9fdfab3b 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -556,8 +556,8 @@ export MPI_BUFFER_SIZE
 
 # Load ParaView
 # ~~~~~~~~~~~~~
-[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.12.0/platforms/$WM_OPTIONS ] && {
-    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.12.0/platforms/$WM_OPTIONS/etc/ParaView-3.12.0.sh
+[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.sh
 #[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ] && {
 #    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
 }