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.
This commit is contained in:
Henry
2015-03-13 11:09:09 +00:00
parent 1715087fbe
commit 408ae9985d
2 changed files with 6 additions and 4 deletions

View File

@ -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

View File

@ -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