zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etc/config.sh/CGAL: unset CGAL_ARCH_PATH if it is no longer needed

Browse Source
This commit is contained in:
Henry Weller
2016-07-01 17:01:26 +01:00
parent e9a1716474
commit 52cbf66c4a
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
etc/config.sh/CGAL
View File

@ -25,11 +25,10 @@
# etc/config.sh/CGAL # etc/config.sh/CGAL
# #
# Description # Description
# Setup file for CGAL (& boost) include/libraries. # Configuration file for BOOST and CGAL include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/bashrc # Sourced from OpenFOAM-<VERSION>/etc/bashrc
# #
# If using system-wide installations for either one, use the following # If using system-wide installations use the following version settings:
# version settings:
# #
# boost_version=boost-system # boost_version=boost-system
# cgal_version=cgal-system # cgal_version=cgal-system
@ -42,16 +41,26 @@ cgal_version=cgal-system
thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
if [ "$boost_version" != "boost-system" -a -d "$thirdPartyPath/$boost_version" ] if [ "$boost_version" != "boost-system" ]
then then
export BOOST_ARCH_PATH=$thirdPartyPath/$boost_version export BOOST_ARCH_PATH=$thirdPartyPath/$boost_version
_foamAddLib $BOOST_ARCH_PATH/lib if [ -d "$BOOST_ARCH_PATH" ]
then
_foamAddLib $BOOST_ARCH_PATH/lib
fi
else
unset BOOST_ARCH_PATH
fi fi
if [ "$cgal_version" != "cgal-system" -a -d "$thirdPartyPath/$cgal_version" ] if [ "$cgal_version" != "cgal-system" ]
then then
export CGAL_ARCH_PATH=$thirdPartyPath/$cgal_version export CGAL_ARCH_PATH=$thirdPartyPath/$cgal_version
_foamAddLib $CGAL_ARCH_PATH/lib if [ -d "$CGAL_ARCH_PATH" ]
then
_foamAddLib $CGAL_ARCH_PATH/lib
fi
else
unset CGAL_ARCH_PATH
fi fi
if [ "$FOAM_VERBOSE" -a "$PS1" ] if [ "$FOAM_VERBOSE" -a "$PS1" ]