mirror of
https://github.com/OpenFOAM/ThirdParty-6.git
synced 2025-12-08 06:57:43 +00:00
Rename makeParaView4 makeParaView and update to support versions 4 and 5
Rename makeParaView makeParaView3 specifically for ParaView version 3
This commit is contained in:
Henry Weller
@ -4,7 +4,7 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
|
||||
<head>
|
||||
<title>OpenFOAM-dev Third-Party packages</title>
|
||||
<!-- 2016-02-07 Sun 10:30 -->
|
||||
<!-- 2016-02-10 Wed 20:21 -->
|
||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<meta name="generator" content="Org-mode" />
|
||||
<style type="text/css">
|
||||
@ -184,7 +184,7 @@ Scripts for building third-party packages.
|
||||
</li>
|
||||
<li>makeCmake (if the system cmake version is < 2.8.8)
|
||||
</li>
|
||||
<li>makeParaView4
|
||||
<li>makeParaView
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@ -337,7 +337,7 @@ change to the vtkXOpenGLRenderWindow.cxx file in ParaView: Uncomment line 30
|
||||
</div></div>
|
||||
<div id="postamble" class="status">
|
||||
<p class="date">Date: 7th February 2016</p>
|
||||
<p class="date">Created: 2016-02-07 Sun 10:30</p>
|
||||
<p class="date">Created: 2016-02-10 Wed 20:21</p>
|
||||
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5 (<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>
|
||||
</div>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
+ makeGcc (recommended if the system gcc is < 4.7)
|
||||
+ Allwmake (Builds OpenMPI, Scotch etc.)
|
||||
+ makeCmake (if the system cmake version is < 2.8.8)
|
||||
+ makeParaView4
|
||||
+ makeParaView
|
||||
*** Optional
|
||||
+ AllwmakeLibccmio (Only required for conversion of STAR-CCM+ meshes)
|
||||
+ Allclean (Only required to save disk space)
|
||||
|
||||
@ -325,7 +325,7 @@ addQtSupport()
|
||||
QtMajor=$1
|
||||
QtMinor=$2
|
||||
|
||||
if [ $QtMajor -lt 4 ] || [ $QtMajor -eq 4 -a $QtMinor -lt 5 ]
|
||||
if [[ ($QtMajor -lt 4) || ($QtMajor -eq 4 && $QtMinor -lt 5) ]]
|
||||
then
|
||||
echo "*** Error: Qt version provided < 4.5"
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 "
|
||||
@ -391,8 +391,6 @@ configParaView()
|
||||
fi
|
||||
mkdir -p $ParaView_BINARY_DIR
|
||||
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=$buildType"
|
||||
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
|
||||
echo "----"
|
||||
@ -404,7 +402,6 @@ configParaView()
|
||||
echo " Source : $ParaView_SOURCE_DIR"
|
||||
echo " Build : $ParaView_BINARY_DIR"
|
||||
echo " Target : $ParaView_DIR"
|
||||
echo " Build type : $buildType"
|
||||
echo "----"
|
||||
echo
|
||||
echo "$cmakeExe" \
|
||||
@ -450,6 +447,19 @@ installParaView()
|
||||
|
||||
make install
|
||||
|
||||
# hack for missing files after install of version 3.14.1
|
||||
echo "Copying missing files to install folder"
|
||||
CMAKE_SRC_DIR=$ParaView_SOURCE_DIR/CMake
|
||||
CMAKE_INSTALL_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR/CMake
|
||||
cp -f $ParaView_SOURCE_DIR/ParaViewUse.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_proxydocumentation.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/smxml_to_xml.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_html.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_wiki.xsl.in $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_qhp.cmake $CMAKE_INSTALL_DIR
|
||||
unset CMAKE_SRC_DIR CMAKE_INSTALL_DIR
|
||||
# --- end hack
|
||||
|
||||
cat<< INFO
|
||||
---
|
||||
Installation complete for paraview-$ParaView_VERSION
|
||||
@ -472,16 +482,20 @@ unset withMESA MESA_INCLUDE MESA_LIBRARY
|
||||
unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
|
||||
unset CMAKE_VARIABLES
|
||||
unset OBJ_ADD
|
||||
unset buildType
|
||||
|
||||
|
||||
# start with these general settings
|
||||
addCMakeVariable "VTK_USE_TK:BOOL=OFF"
|
||||
addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF"
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=Release"
|
||||
|
||||
# include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
|
||||
|
||||
# don't build test tree
|
||||
addCMakeVariable "BUILD_TESTING:BOOL=OFF"
|
||||
|
||||
# remove dependency on WebKit
|
||||
# addCMakeVariable VTK_QT_USE_WEBKIT:BOOL=OFF
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
@ -325,7 +325,7 @@ addQtSupport()
|
||||
QtMajor=$1
|
||||
QtMinor=$2
|
||||
|
||||
if [[ ($QtMajor -lt 4) || ($QtMajor -eq 4 && $QtMinor -lt 5) ]]
|
||||
if [ $QtMajor -lt 4 ] || [ $QtMajor -eq 4 -a $QtMinor -lt 5 ]
|
||||
then
|
||||
echo "*** Error: Qt version provided < 4.5"
|
||||
echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.5 "
|
||||
@ -391,6 +391,8 @@ configParaView()
|
||||
fi
|
||||
mkdir -p $ParaView_BINARY_DIR
|
||||
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=$buildType"
|
||||
|
||||
cd $ParaView_BINARY_DIR || exit 1 # change to build folder
|
||||
|
||||
echo "----"
|
||||
@ -402,6 +404,7 @@ configParaView()
|
||||
echo " Source : $ParaView_SOURCE_DIR"
|
||||
echo " Build : $ParaView_BINARY_DIR"
|
||||
echo " Target : $ParaView_DIR"
|
||||
echo " Build type : $buildType"
|
||||
echo "----"
|
||||
echo
|
||||
echo "$cmakeExe" \
|
||||
@ -447,19 +450,6 @@ installParaView()
|
||||
|
||||
make install
|
||||
|
||||
# hack for missing files after install of version 3.14.1
|
||||
echo "Copying missing files to install folder"
|
||||
CMAKE_SRC_DIR=$ParaView_SOURCE_DIR/CMake
|
||||
CMAKE_INSTALL_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR/CMake
|
||||
cp -f $ParaView_SOURCE_DIR/ParaViewUse.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_proxydocumentation.cmake $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/smxml_to_xml.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_html.xsl $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/xml_to_wiki.xsl.in $CMAKE_INSTALL_DIR
|
||||
cp -f $CMAKE_SRC_DIR/generate_qhp.cmake $CMAKE_INSTALL_DIR
|
||||
unset CMAKE_SRC_DIR CMAKE_INSTALL_DIR
|
||||
# --- end hack
|
||||
|
||||
cat<< INFO
|
||||
---
|
||||
Installation complete for paraview-$ParaView_VERSION
|
||||
@ -482,20 +472,16 @@ unset withMESA MESA_INCLUDE MESA_LIBRARY
|
||||
unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
|
||||
unset CMAKE_VARIABLES
|
||||
unset OBJ_ADD
|
||||
|
||||
unset buildType
|
||||
|
||||
# start with these general settings
|
||||
addCMakeVariable "VTK_USE_TK:BOOL=OFF"
|
||||
addCMakeVariable "BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF"
|
||||
addCMakeVariable "CMAKE_BUILD_TYPE:STRING=Release"
|
||||
|
||||
# include development files in "make install"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON"
|
||||
addCMakeVariable "PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
|
||||
|
||||
# don't build test tree
|
||||
addCMakeVariable "BUILD_TESTING:BOOL=OFF"
|
||||
|
||||
# remove dependency on WebKit
|
||||
# addCMakeVariable VTK_QT_USE_WEBKIT:BOOL=OFF
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
||||
15
makeParaView
15
makeParaView
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -26,7 +26,7 @@
|
||||
# makeParaView
|
||||
#
|
||||
# Description
|
||||
# Make and install paraview for version 3.14.1 and higher
|
||||
# Make and install paraview 4 or 5
|
||||
# - place the paraview source under $WM_THIRD_PARTY_DIR/ParaView-VERSION
|
||||
# (note capitalisation)
|
||||
#
|
||||
@ -107,8 +107,8 @@ The -no-FEATURE option can be disable these features (if not already disabled):
|
||||
|
||||
CMake options start with a capital letter and contain an '='.
|
||||
For example,
|
||||
$Script BUILD_TESTING=ON PARAVIEW_GENERATE_PROXY_DOCUMENTATION=OFF
|
||||
to add tests and avoid building documentation
|
||||
$Script BUILD_TESTING=ON
|
||||
to add tests
|
||||
|
||||
For finer control, the build stages can be selected or deselected individually:
|
||||
-config -no-config
|
||||
@ -146,6 +146,7 @@ setVersion
|
||||
#
|
||||
unset runCONFIG runMAKE runINSTALL
|
||||
runDEFAULT=true
|
||||
buildType=Release
|
||||
|
||||
# parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
@ -270,6 +271,11 @@ do
|
||||
export ParaView_MAJOR="$2"
|
||||
shift 2
|
||||
;;
|
||||
-buildType)
|
||||
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
|
||||
buildType="$2"
|
||||
shift 2
|
||||
;;
|
||||
*)
|
||||
usage "unknown option/argument: '$*'"
|
||||
;;
|
||||
@ -317,6 +323,7 @@ Version information
|
||||
qt ${QtVersion:-none}
|
||||
version ${ParaView_VERSION:-unknown}
|
||||
major ${ParaView_MAJOR:-unknown}
|
||||
build ${buildType:-Release}
|
||||
$(checkVersion)
|
||||
---------------------
|
||||
SUMMARY
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -23,10 +23,10 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# Script
|
||||
# makeParaView
|
||||
# makeParaView3
|
||||
#
|
||||
# Description
|
||||
# Make and install paraview
|
||||
# Make and install paraview for version 3.14.1 and higher
|
||||
# - place the paraview source under $WM_THIRD_PARTY_DIR/ParaView-VERSION
|
||||
# (note capitalisation)
|
||||
#
|
||||
@ -40,7 +40,7 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
|
||||
exit 1
|
||||
}
|
||||
. etc/tools/ThirdPartyFunctions
|
||||
. etc/tools/ParaView4Functions
|
||||
. etc/tools/ParaView3Functions
|
||||
#------------------------------------------------------------------------------
|
||||
#
|
||||
# USER OPTIONS:
|
||||
@ -107,8 +107,8 @@ The -no-FEATURE option can be disable these features (if not already disabled):
|
||||
|
||||
CMake options start with a capital letter and contain an '='.
|
||||
For example,
|
||||
$Script BUILD_TESTING=ON
|
||||
to add tests
|
||||
$Script BUILD_TESTING=ON PARAVIEW_GENERATE_PROXY_DOCUMENTATION=OFF
|
||||
to add tests and avoid building documentation
|
||||
|
||||
For finer control, the build stages can be selected or deselected individually:
|
||||
-config -no-config
|
||||
@ -146,7 +146,6 @@ setVersion
|
||||
#
|
||||
unset runCONFIG runMAKE runINSTALL
|
||||
runDEFAULT=true
|
||||
buildType=Release
|
||||
|
||||
# parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
@ -271,11 +270,6 @@ do
|
||||
export ParaView_MAJOR="$2"
|
||||
shift 2
|
||||
;;
|
||||
-buildType)
|
||||
[ "$#" -ge 2 ] || usage "'$1' option requires an argument"
|
||||
buildType="$2"
|
||||
shift 2
|
||||
;;
|
||||
*)
|
||||
usage "unknown option/argument: '$*'"
|
||||
;;
|
||||
@ -323,7 +317,6 @@ Version information
|
||||
qt ${QtVersion:-none}
|
||||
version ${ParaView_VERSION:-unknown}
|
||||
major ${ParaView_MAJOR:-unknown}
|
||||
build ${buildType:-Release}
|
||||
$(checkVersion)
|
||||
---------------------
|
||||
SUMMARY
|
||||
@ -334,4 +327,5 @@ SUMMARY
|
||||
|
||||
echo
|
||||
echo Done
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
Reference in New Issue
Block a user