From 408ae9985d9c2482238f86f09e4a41f184e4d00b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 13 Mar 2015 11:09:09 +0000
Subject: [PATCH] ParaView: Upgrade to 4.3.1

Note that in order to build and install ParaView-4.3.1 lines 653-656
must be removed or commented from file

ThirdParty-dev/ParaView-4.3.1/Qt/Components/CMakeLists.txt

after unpacking the ParaView-4.3.1 source-pack from KitWare.  This is
because the file ui_pqExportStateWizard.h referred to in the lines
653-656:

if(PARAVIEW_INSTALL_DEVELOPMENT_FILES)
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ui_pqExportStateWizard.h"
          DESTINATION "${VTK_INSTALL_INCLUDE_DIR}")
endif()

does not exist and cannot be installed causing the build and
installation to fail.
---
 etc/config/paraview.csh | 5 +++--
 etc/config/paraview.sh  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 4d8d74976..2d67783b1 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -39,7 +39,7 @@ if ( $status == 0 ) setenv PATH $cleaned
 
 # determine the cmake to be used
 unsetenv CMAKE_HOME
-foreach cmake ( cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
+foreach cmake ( cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
     set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if ( -r $cmake ) then
         setenv CMAKE_HOME $cmake
@@ -51,7 +51,8 @@ end
 #- ParaView version, automatically determine major version:
 #setenv ParaView_VERSION 3.12.0
 #setenv ParaView_VERSION 4.0.1
-setenv ParaView_VERSION 4.1.0
+#setenv ParaView_VERSION 4.1.0
+setenv ParaView_VERSION 4.3.1
 setenv ParaView_MAJOR detect
 
 
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index 667b92af3..d1a595a42 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -38,7 +38,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
 
 # determine the cmake to be used
 unset CMAKE_HOME
-for cmake in cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
+for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
 do
     cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if [ -r $cmake ]
@@ -53,7 +53,8 @@ done
 #- ParaView version, automatically determine major version
 #export ParaView_VERSION=3.12.0
 #export ParaView_VERSION=4.0.1
-export ParaView_VERSION=4.1.0
+#export ParaView_VERSION=4.1.0
+export ParaView_VERSION=4.3.1
 export ParaView_MAJOR=detect