mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ea6eac35a6
Patch contributed by Bruno Santos: - "etc/config.sh/CGAL": - Indented the contents of the recently added if block. - Added comment about using system versions. - Library paths are now only added if the respective version is not "boost-system" and "cgal-system". - "src/renumber/Allwmake": It now relies on the previous file to get the version for Boost (the same way as in "makeCGAL"). This is so that it will also build "SloanRenumber" if "boost_version" is set to "boost-system". - "applications/utilities/mesh/generation/Allwmake": It now also relies on the script "config.sh/CGAL" to get the version for CGAL. If "cgal_version" is set to "cgal-system", it will now also build "foamy*Mesh" utilities and respective libraries. Resolves report http://www.openfoam.org/mantisbt/view.php?id=1232
71 lines
2.3 KiB
Bash
71 lines
2.3 KiB
Bash
#----------------------------------*-sh-*--------------------------------------
|
|
# ========= |
|
|
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
# \\ / O peration |
|
|
# \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
|
|
# \\/ M anipulation |
|
|
#------------------------------------------------------------------------------
|
|
# License
|
|
# This file is part of OpenFOAM.
|
|
#
|
|
# OpenFOAM is free software: you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
# for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
# File
|
|
# etc/config.sh/CGAL
|
|
#
|
|
# Description
|
|
# Setup file for CGAL (& boost) include/libraries.
|
|
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
|
|
#
|
|
# If using system-wide installations for either one, use the following
|
|
# version settings:
|
|
#
|
|
# boost_version=boost-system
|
|
# cgal_version=cgal-system
|
|
#------------------------------------------------------------------------------
|
|
|
|
boost_version=boost-system
|
|
cgal_version=CGAL-4.7
|
|
|
|
if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
|
|
then
|
|
|
|
common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
|
|
|
|
export BOOST_ARCH_PATH=$common_path/$boost_version
|
|
export CGAL_ARCH_PATH=$common_path/$cgal_version
|
|
|
|
if [ "$FOAM_VERBOSE" -a "$PS1" ]
|
|
then
|
|
echo "Using CGAL and boost" 1>&2
|
|
echo " $cgal_version at $CGAL_ARCH_PATH" 1>&2
|
|
echo " $boost_version at $BOOST_ARCH_PATH" 1>&2
|
|
fi
|
|
|
|
if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ]
|
|
then
|
|
_foamAddLib $CGAL_ARCH_PATH/lib
|
|
fi
|
|
|
|
if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ]
|
|
then
|
|
_foamAddLib $BOOST_ARCH_PATH/lib
|
|
fi
|
|
|
|
unset boost_version cgal_version common_path
|
|
|
|
fi
|
|
|
|
#------------------------------------------------------------------------------
|