Commit e9e97603 authored by Mark Olesen's avatar Mark Olesen
Browse files

CONFIG: bump versions of various third-party sources

* boost 1_62_0 (Sept 2016)

* CGAL 4.9 (Sept 2016)
  - now has headers-only mode that could be interesting

* FFTW 3.3.5 (Jul 2016)

* openmpi 1.10.4 (Sept 2016)
  - the first openmpi 2.x release is also available, but too early to switch

* paraview 5.2.0 (Nov 2016)
  - builds without additional patching

STYLE: removed unneeded CMake environment variables
parent fa430cc4
......@@ -50,8 +50,8 @@
#
#------------------------------------------------------------------------------
set boost_version=boost_1_61_0
set cgal_version=CGAL-4.8
set boost_version=boost_1_62_0
set cgal_version=CGAL-4.9
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
......
......@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# etc/config.sh/FFTW
# etc/config.csh/FFTW
#
# Description
# Setup file for FFTW include/libraries.
......@@ -48,7 +48,7 @@
#
#------------------------------------------------------------------------------
set fftw_version=fftw-3.3.4
set fftw_version=fftw-3.3.5
setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
......
......@@ -51,7 +51,7 @@ case SYSTEMOPENMPI:
breaksw
case OPENMPI:
setenv FOAM_MPI openmpi-1.10.2
setenv FOAM_MPI openmpi-1.10.4
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/openmpi`
......
......@@ -51,7 +51,7 @@
#
#------------------------------------------------------------------------------
setenv ParaView_VERSION 5.1.2
setenv ParaView_VERSION 5.2.0
setenv ParaView_MAJOR detect # Automatically determine major version
set cmake_version=cmake-system
......@@ -63,12 +63,10 @@ if ( ! $?ParaView_DIR ) setenv ParaView_DIR
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
if ( $status == 0 ) setenv PATH $cleaned
# Environment for ThirdParty cmake
unsetenv CMAKE_HOME
# ThirdParty cmake
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
if ( -r $cmake ) then
setenv CMAKE_HOME $cmake
setenv PATH ${CMAKE_HOME}/bin:${PATH}
if ( -r $cmake/bin/cmake ) then
_foamAddPath $cmake/bin
endif
# Evaluate command-line parameters for ParaView
......@@ -112,9 +110,9 @@ if ( $?ParaView_VERSION ) then
set pvLibDir=${ParaView_DIR}/lib/$pvMajor
set pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/$pvMajor
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/$pvMajor
setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}"
# Add in python libraries if required
......
......@@ -49,8 +49,8 @@
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
boost_version=boost_1_61_0
cgal_version=CGAL-4.8
boost_version=boost_1_62_0
cgal_version=CGAL-4.9
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
......
......@@ -47,7 +47,7 @@
# - the LD_LIBRARY_PATH is not adjusted.
#------------------------------------------------------------------------------
fftw_version=fftw-3.3.4
fftw_version=fftw-3.3.5
export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
......
......@@ -54,7 +54,7 @@ SYSTEMOPENMPI)
;;
OPENMPI)
export FOAM_MPI=openmpi-1.10.2
export FOAM_MPI=openmpi-1.10.4
# Optional configuration tweaks:
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/openmpi`
......
......@@ -51,7 +51,7 @@
#
#------------------------------------------------------------------------------
ParaView_VERSION=5.1.2
ParaView_VERSION=5.2.0
ParaView_MAJOR=detect # Automatically determine major version
cmake_version=cmake-system
......@@ -66,14 +66,11 @@ cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \
) \
&& PATH="$cleaned"
# Environment for ThirdParty cmake
unset CMAKE_HOME
# ThirdParty cmake
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
if [ -r $cmake ]
if [ -r $cmake/bin/cmake ]
then
export CMAKE_HOME=$cmake
export CMAKE_ROOT=$cmake
export PATH=$CMAKE_HOME/bin:$PATH
_foamAddPath $cmake/bin
fi
# Evaluate command-line parameters for ParaView
......@@ -125,9 +122,9 @@ then
pvLibDir=$ParaView_DIR/lib/$pvMajor
pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
export PATH=$ParaView_DIR/bin:$PATH
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/$pvMajor
export PV_PLUGIN_PATH=$FOAM_LIBBIN/$pvMajor
export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$pvLibDir:$LD_LIBRARY_PATH
# Add in python libraries if required
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment