13 Commits

Author SHA1 Message Date
c62211ef46 Updated to OpenFOAM-6 2018-07-07 19:45:40 +01:00
fd02fb4797 makeGcc: reinstate support for -no-multilib option
Patch contributed by Bruno Santos
Resolves bug-report https://bugs.openfoam.org/view.php?id=2943
2018-05-18 09:45:15 +01:00
87e46ac8b4 makeGcc: Add --enable-multilib for gcc-8 2018-05-17 16:38:38 +01:00
bcb438a255 CGAL: Added -DCGAL_NO_DEPRECATED_CODE
Resolves patch request https://bugs.openfoam.org/view.php?id=2869
2018-03-07 21:34:28 +00:00
d99e4bf60d makeCGAL: Correct toolset name to build Boost with Intel compiler
Resolves bug-report https://bugs.openfoam.org/view.php?id=2838
2018-02-10 17:14:57 +00:00
eab4ace820 ParaViewFunctions: Remove warning message in ParaView when built with OpenGL back-end
Patch contributed by Bruno Santos
Resolves patch request https://bugs.openfoam.org/view.php?id=2779
2017-12-04 12:33:57 +00:00
0cc047cc85 makeParaView: Added arguments for backend rendering and Python include path
Patch contributed by Bruno Santos
Resolves contribution request https://bugs.openfoam.org/view.php?id=2668
2017-08-17 14:06:24 +01:00
ee90d1ba66 ParaViewFunctions: Updated to handle Qt versions for ParaView-5.4
Patch contributed by Bruno Santos
Resolves bug-report https://bugs.openfoam.org/view.php?id=2640
2017-08-14 10:36:22 +01:00
c29f733925 makeCGAL: Updated to handle older operating systems
which name the 64bit library directory lib rather than lib64

Resolves bug report https://bugs.openfoam.org/view.php?id=2657
2017-08-11 00:09:47 +01:00
0d8fc2a63c Upgraded cmake to 3.9.0
Resolves bug-report https://bugs.openfoam.org/view.php?id=2648
2017-08-04 11:45:47 +01:00
8ff943f342 CGAL: Upgraded to 4.10 2017-07-28 08:27:06 +01:00
0152de468d CGAL: Upgraded to 4.10 2017-07-28 08:25:14 +01:00
0fe4588598 README: Corrected date 2017-07-27 14:37:42 +01:00
8 changed files with 114 additions and 48 deletions

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -352,10 +352,10 @@ echo Build CGAL
if [ -n "$CGAL_ARCH_PATH" ] if [ -n "$CGAL_ARCH_PATH" ]
then then
( (
if [ -r $CGAL_ARCH_PATH/lib/libCGAL.so ] if [ -r $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libCGAL.so ]
then then
echo " CGAL headers in $CGAL_ARCH_PATH/include" echo " CGAL headers in $CGAL_ARCH_PATH/include"
echo " CGAL libs in $CGAL_ARCH_PATH/lib" echo " CGAL libs in $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
else else
./makeCGAL ./makeCGAL
fi fi

View File

@ -3,8 +3,8 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head> <head>
<title>OpenFOAM-dev Third-Party packages</title> <title>OpenFOAM-6 Third-Party packages</title>
<!-- 2017-07-25 Tue 11:10 --> <!-- 2018-07-07 Sat 16:56 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" /> <meta name="generator" content="Org-mode" />
<style type="text/css"> <style type="text/css">
@ -136,7 +136,7 @@ for the JavaScript code in this tag.
</head> </head>
<body> <body>
<div id="content"> <div id="content">
<h1 class="title">OpenFOAM-dev Third-Party packages</h1> <h1 class="title">OpenFOAM-6 Third-Party packages</h1>
<div id="table-of-contents"> <div id="table-of-contents">
<h2>Table of Contents</h2> <h2>Table of Contents</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
@ -185,6 +185,8 @@ Scripts for building third-party packages.
</li> </li>
<li>Allwmake (Builds OpenMPI, Scotch etc.) <li>Allwmake (Builds OpenMPI, Scotch etc.)
</li> </li>
<li>makeCmake (if the system cmake version is &lt; 3.3.0)
</li>
<li>makeParaView <li>makeParaView
</li> </li>
</ul> </ul>
@ -232,7 +234,7 @@ The minimum version of gcc required is 4.8.0
<h4 id="sec-4-2-1"><span class="section-number-4">4.2.1</span> Scotch</h4> <h4 id="sec-4-2-1"><span class="section-number-4">4.2.1</span> Scotch</h4>
<div class="outline-text-4" id="text-4-2-1"> <div class="outline-text-4" id="text-4-2-1">
<p> <p>
Scotch-6.0.3 is provided with ThirdParty-dev or the original source pack Scotch-6.0.3 is provided with ThirdParty-6 or the original source pack
may be obtained from: may be obtained from:
</p> </p>
<ul class="org-ul"> <ul class="org-ul">
@ -255,11 +257,12 @@ may be obtained from:
<h3 id="sec-4-3"><span class="section-number-3">4.3</span> ParaView</h3> <h3 id="sec-4-3"><span class="section-number-3">4.3</span> ParaView</h3>
<div class="outline-text-3" id="text-4-3"> <div class="outline-text-3" id="text-4-3">
<p> <p>
Patched versions of the ParaView source code were once provided for ParaView If the system cmake version is &lt; 3.3.0 you will need to download and build a
v5.0.1. With the current supported version of ParaView (v.5.4.0), the recent version:
source code
</p> </p>
<ul class="org-ul"> <ul class="org-ul">
<li>cmake <a href="http://www.cmake.org/files/v3.9/cmake-3.9.0.tar.gz">http://www.cmake.org/files/v3.9/cmake-3.9.0.tar.gz</a>
</li>
<li>ParaView-5.4.0 <a href="http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz">http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz</a> <li>ParaView-5.4.0 <a href="http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz">http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz</a>
</li> </li>
</ul> </ul>
@ -286,7 +289,7 @@ the .bashrc (or .cshrc) file or by typing
<h3 id="sec-4-4"><span class="section-number-3">4.4</span> CGAL</h3> <h3 id="sec-4-4"><span class="section-number-3">4.4</span> CGAL</h3>
<div class="outline-text-3" id="text-4-4"> <div class="outline-text-3" id="text-4-4">
<ul class="org-ul"> <ul class="org-ul">
<li>CGAL <a href="https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.8.1/CGAL-4.8.1.tar.xz">https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.8.1/CGAL-4.8.1.tar.xz</a> <li>CGAL <a href="https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.10/CGAL-4.10.tar.xz">https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.10/CGAL-4.10.tar.xz</a>
</li> </li>
<li>boost <a href="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download">http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download</a> <li>boost <a href="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download">http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download</a>
</li> </li>
@ -305,9 +308,9 @@ the .bashrc (or .cshrc) file or by typing
</div> </div>
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="date">Date: 25st July 2017</p> <p class="date">Date: 10th July 2018</p>
<p class="date">Created: 2017-07-25 Tue 11:10</p> <p class="date">Created: 2018-07-07 Sat 16:56</p>
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.1.91 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p> <p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.3 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p>
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p> <p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
</div> </div>
</body> </body>

View File

@ -1,8 +1,8 @@
# -*- mode: org; -*- # -*- mode: org; -*-
# #
#+TITLE: OpenFOAM-dev Third-Party packages #+TITLE: OpenFOAM-6 Third-Party packages
#+AUTHOR: The OpenFOAM Foundation #+AUTHOR: The OpenFOAM Foundation
#+DATE: 25st July 2017 #+DATE: 10th July 2018
#+LINK: http://www.openfoam.org #+LINK: http://www.openfoam.org
#+OPTIONS: author:nil ^:{} #+OPTIONS: author:nil ^:{}
# Copyright (c) 2014-2016 OpenFOAM Foundation. # Copyright (c) 2014-2016 OpenFOAM Foundation.
@ -13,6 +13,7 @@
* Order of execution: * Order of execution:
+ makeGcc (recommended if the system gcc is < 4.8) + makeGcc (recommended if the system gcc is < 4.8)
+ Allwmake (Builds OpenMPI, Scotch etc.) + Allwmake (Builds OpenMPI, Scotch etc.)
+ makeCmake (if the system cmake version is < 3.3.0)
+ makeParaView + makeParaView
*** Optional *** Optional
+ AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes) + AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes)
@ -29,15 +30,15 @@
http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz
*** Parallel Processing *** Parallel Processing
***** Scotch ***** Scotch
Scotch-6.0.3 is provided with ThirdParty-dev or the original source pack Scotch-6.0.3 is provided with ThirdParty-6 or the original source pack
may be obtained from: may be obtained from:
+ Scotch/PtScotch: https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz + Scotch/PtScotch: https://gforge.inria.fr/frs/download.php/file/34099/scotch_6.0.3.tar.gz
***** OpenMPI ***** OpenMPI
+ OpenMPI: https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.bz2 + OpenMPI: https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.bz2
*** ParaView *** ParaView
Patched versions of the ParaView source code were once provided for ParaView If the system cmake version is < 3.3.0 you will need to download and build a
v5.0.1. With the current supported version of ParaView (v.5.4.0), the recent version:
source code + cmake http://www.cmake.org/files/v3.9/cmake-3.9.0.tar.gz
+ ParaView-5.4.0 http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz + ParaView-5.4.0 http://www.paraview.org/files/v5.4/ParaView-v5.4.0.tar.gz
is downloaded automatically and compiles without modification. ParaView is is downloaded automatically and compiles without modification. ParaView is
compiled by running the =makeParaView= script, i.e. compiled by running the =makeParaView= script, i.e.
@ -47,7 +48,7 @@
the .bashrc (or .cshrc) file or by typing the .bashrc (or .cshrc) file or by typing
+ wmRefresh + wmRefresh
*** CGAL *** CGAL
+ CGAL https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.8.1/CGAL-4.8.1.tar.xz + CGAL https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.10/CGAL-4.10.tar.xz
+ boost http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download + boost http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download
*** Miscellaneous *** Miscellaneous
+ libccmio http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz + libccmio http://portal.nersc.gov/svn/visit/trunk/third_party/libccmio-2.6.1.tar.gz

View File

@ -174,7 +174,7 @@ addCMakeVariable()
{ {
for var in $* for var in $*
do do
CMAKE_VARIABLES="$CMAKE_VARIABLES -D$var" CMAKE_VARIABLES="$CMAKE_VARIABLES -D$var"
done done
} }
@ -227,7 +227,7 @@ addPythonSupport()
if [ ! -e "$PYTHON_LIBRARY" ] if [ ! -e "$PYTHON_LIBRARY" ]
then then
echo "*** Error: libpython not found at location specified " \ echo "*** Error: libpython not found at location specified " \
"by -pythnon-lib input: PYTHON_LIBRARY=$PYTHON_LIBRARY" "by -python-lib input: PYTHON_LIBRARY=$PYTHON_LIBRARY"
fi fi
else else
# Try to get $PYTHON_LIBRARY from dynamically linked binary # Try to get $PYTHON_LIBRARY from dynamically linked binary
@ -248,28 +248,31 @@ addPythonSupport()
} }
pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/') pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
pythonInclude=/usr/include/python$pythonMajor
# Note - we could also allow for a PYTHON_INCLUDE variable ... if [ -z "$PYTHON_INCLUDE" ]
[ -d "$pythonInclude" ] || { then
echo " No python headers found in $pythonInclude/" PYTHON_INCLUDE=/usr/include/python$pythonMajor
fi
[ -d "$PYTHON_INCLUDE" ] || {
echo " No python headers found in $PYTHON_INCLUDE/"
echo " Please install python headers or deactivate " echo " Please install python headers or deactivate "
echo " python support by not using the -python option" echo " python support by not using the -python option"
exit 1 exit 1
} }
addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON" addCMakeVariable "PARAVIEW_ENABLE_PYTHON=ON"
addCMakeVariable "PYTHON_INCLUDE_PATH=$pythonInclude" addCMakeVariable "PYTHON_INCLUDE_PATH=$PYTHON_INCLUDE"
addCMakeVariable "PYTHON_LIBRARY=$PYTHON_LIBRARY" addCMakeVariable "PYTHON_LIBRARY=$PYTHON_LIBRARY"
echo "----" echo "----"
echo "Python information:" echo "Python information:"
echo " executable : $pythonBin" echo " executable : $pythonBin"
echo " version : $pythonMajor" echo " version : $pythonMajor"
echo " include path : $pythonInclude" echo " include path : $PYTHON_INCLUDE"
echo " library : $PYTHON_LIBRARY" echo " library : $PYTHON_LIBRARY"
unset pythonBin pythonInclude pythonMajor unset pythonBin pythonMajor
else else
echo "*** Error: python not found" echo "*** Error: python not found"
echo "*** Deactivate python support by not using the -python " echo "*** Deactivate python support by not using the -python "
@ -374,14 +377,26 @@ addQtSupport()
QtMajor=$1 QtMajor=$1
QtMinor=$2 QtMinor=$2
if [ $QtMajor -lt 4 -o $QtMajor -eq 4 -a $QtMinor -lt 5 ] if [ $QtMajor -lt 4 -o $QtMajor -eq 4 -a $QtMinor -lt 7 ]
then then
echo "*** Error: Qt version provided < 4.5" echo "*** Error: Qt 4 version provided < 4.7"
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5" echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.7"
echo "*** e.g." echo "*** e.g."
echo "*** -qmake /usr/local/qt-4.6.2/bin/qmake" echo "*** -qmake /usr/local/qt-4.7.2/bin/qmake"
echo "*** -qmake $installBASE/qt-4.6.2/bin/qmake" echo "*** -qmake $installBASE/qt-4.7.2/bin/qmake"
exit 1 exit 1
elif [ $QtMajor -eq 5 -a $QtMinor -lt 6 ]
then
echo "*** Error: Qt 5 version provided < 5.6"
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 5.6"
echo "*** e.g."
echo "*** -qmake /usr/local/qt-5.6.0/bin/qmake"
echo "*** -qmake $installBASE/qt-5.6.0/bin/qmake"
exit 1
else
# Enforce the Qt version to be used, so that users don't have to
# guess how to tell ParaView to use the desired Qt version
addCMakeVariable "PARAVIEW_QT_VERSION=$QtMajor"
fi fi
else else
echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH" echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH"
@ -390,6 +405,26 @@ addQtSupport()
} }
#
# Configure ParaView/VTK rendering backend
#
configRenderingBackend()
{
# Choose the rendering engine
if [ -n "${RENDERING_BACKEND}" ]
then
addCMakeVariable "VTK_RENDERING_BACKEND=${RENDERING_BACKEND}"
if [ "${RENDERING_BACKEND}" = "OpenGL" ]
then
addCMakeVariable "VTK_LEGACY_SILENT=ON"
fi
else
usage "*** Error: No rendering backend is defined"
fi
}
# #
# Configure via cmake, but don't actually build anything # Configure via cmake, but don't actually build anything
# #
@ -529,9 +564,6 @@ unset buildType
# Start with these general settings # Start with these general settings
addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF" addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF"
# Choose the new rendering engine
addCMakeVariable "VTK_RENDERING_BACKEND=OpenGL2"
# Include development files in "make install" # Include development files in "make install"
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON" addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -43,7 +43,7 @@
_foamEval $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL) _foamEval $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler) _foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
cgalPACKAGE=${cgal_version:-CGAL-4.8.1} cgalPACKAGE=${cgal_version:-CGAL-4.10}
boostPACKAGE=${boost_version:-boost-system} boostPACKAGE=${boost_version:-boost-system}
gmpPACKAGE=${gmp_version:-gmp-system} gmpPACKAGE=${gmp_version:-gmp-system}
mpfrPACKAGE=${mpfr_version:-mpfr-system} mpfrPACKAGE=${mpfr_version:-mpfr-system}
@ -144,6 +144,11 @@ then
boostInc="$BOOST_ARCH_PATH/include" boostInc="$BOOST_ARCH_PATH/include"
boostLib="$BOOST_ARCH_PATH/lib" boostLib="$BOOST_ARCH_PATH/lib"
toolset="$WM_CC"
if [ $WM_COMPILER == "Icc" ]; then
toolset=intel
fi
echo "Starting build: boost" echo "Starting build: boost"
( (
cd $BOOST_SOURCE_DIR || exit 1 cd $BOOST_SOURCE_DIR || exit 1
@ -154,7 +159,7 @@ then
--prefix=$BOOST_ARCH_PATH \ --prefix=$BOOST_ARCH_PATH \
--with-libraries=thread \ --with-libraries=thread \
--with-libraries=system \ --with-libraries=system \
&& ./bjam toolset=$WM_CC -j $WM_NCOMPPROCS install \ && ./bjam toolset=$toolset -j $WM_NCOMPPROCS install \
&& echo "Built: boost" && echo "Built: boost"
) || { ) || {
echo "Error building: boost" echo "Error building: boost"
@ -274,6 +279,8 @@ CMAKE_OPTIONS
-DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \ -DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DWITH_CGAL_Qt5=OFF \ -DWITH_CGAL_Qt5=OFF \
-DCGAL_INSTALL_LIB_DIR=lib$WM_COMPILER_LIB_ARCH \
-DCGAL_CXX_FLAGS="-DCGAL_NO_DEPRECATED_CODE" \
$configBoost $configGmpMpfr \ $configBoost $configGmpMpfr \
$CGAL_SOURCE_DIR \ $CGAL_SOURCE_DIR \
&& make -j $WM_NCOMPPROCS \ && make -j $WM_NCOMPPROCS \

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -29,7 +29,7 @@
# Build script for cmake # Build script for cmake
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
cmakePACKAGE=cmake-3.2.1 cmakePACKAGE=cmake-3.9.0
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# run from third-party directory only # run from third-party directory only

View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -71,7 +71,7 @@ USAGE
exit 1 exit 1
} }
GCC_BUILD_OPTIONS="" GCC_BUILD_OPTIONS="--enable-multilib"
# Parse options # Parse options
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]

View File

@ -55,7 +55,10 @@ MPI_MAX_PROCS=32
# If it fails, specify the path using the PYTHON_LIBRARY variable # If it fails, specify the path using the PYTHON_LIBRARY variable
withPYTHON=false withPYTHON=false
PYTHON_LIBRARY="" PYTHON_LIBRARY=""
# PYTHON_LIBRARY="/usr/lib64/libpython2.6.so.1.0" PYTHON_INCLUDE=""
# Examples
# PYTHON_LIBRARY="/usr/lib64/libpython2.7.so.1.0"
# PYTHON_INCLUDE="/usr/include/python2.7"
# MESA graphics support: # MESA graphics support:
withMESA=false withMESA=false
@ -65,12 +68,16 @@ MESA_LIBRARY="/usr/lib64/libOSMesa.so"
# extra QT gui support (useful for some third party apps) # extra QT gui support (useful for some third party apps)
withQT=true withQT=true
# Set the path to the Qt-4.5 (or later) qmake if the system Qt is older # Set the path to the Qt-4.7 (or later) qmake if the system Qt is older
QMAKE_PATH="" QMAKE_PATH=""
# Set the path to cmake # Set the path to cmake
CMAKE_PATH="" CMAKE_PATH=""
# Selection of the rendering backend, usually associated to the OpenGL version
# RENDERING_BACKEND=OpenGL
RENDERING_BACKEND=OpenGL2
# #
# NO FURTHER EDITING BELOW THIS LINE # NO FURTHER EDITING BELOW THIS LINE
# #
@ -84,6 +91,8 @@ usage() {
usage: $Script [OPTION] [CMAKE-OPTION] usage: $Script [OPTION] [CMAKE-OPTION]
options: options:
-rebuild for repeated builds (-make -install) *use with caution* -rebuild for repeated builds (-make -install) *use with caution*
-rendering MODE rendering backend engine (current value: ${RENDERING_BACKEND:-undefined})
modes: OpenGL OpenGL2
-mesa with mesa (if not already enabled) -mesa with mesa (if not already enabled)
-mpi with mpi (if not already enabled) -mpi with mpi (if not already enabled)
-python with python (if not already enabled) -python with python (if not already enabled)
@ -99,7 +108,9 @@ options:
-mesa-include DIR -mesa-include DIR
location of mesa headers (current value: ${MESA_INCLUDE:-none}) location of mesa headers (current value: ${MESA_INCLUDE:-none})
-mesa-lib PATH path to mesa library (current value: ${MESA_LIBRARY:-none}) -mesa-lib PATH path to mesa library (current value: ${MESA_LIBRARY:-none})
-python-lib PATH path to python library (current value: ${PYTHON_LIBRARY:-none}) -python-lib PATH path to python library (current value: ${PYTHON_LIBRARY:-automatic})
-python-include DIR
path to python include directory (current value: ${PYTHON_INCLUDE:-automatic})
-help -help
The -no-FEATURE option can be disable these features (if not already disabled): The -no-FEATURE option can be disable these features (if not already disabled):
@ -196,6 +207,11 @@ do
unset runDEFAULT unset runDEFAULT
shift shift
;; ;;
-rendering)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
RENDERING_BACKEND="$2"
shift 2
;;
-mesa) -mesa)
withMESA=true withMESA=true
shift shift
@ -235,6 +251,11 @@ do
PYTHON_LIBRARY="$2" PYTHON_LIBRARY="$2"
shift 2 shift 2
;; ;;
-python-include)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
PYTHON_INCLUDE="$2"
shift 2
;;
-cmake) -cmake)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
CMAKE_PATH=$2 CMAKE_PATH=$2
@ -302,6 +323,8 @@ addPythonSupport # set Python-specific options
addMesaSupport # set MESA-specific options addMesaSupport # set MESA-specific options
addQtSupport # add extra Qt support addQtSupport # add extra Qt support
configRenderingBackend # configure the rendering backend, e.g. OpenGL2
setDirs # where things are or should be put setDirs # where things are or should be put
echoDateStamp # report kitware source code date-stamp echoDateStamp # report kitware source code date-stamp