Commit 64d256f7 authored by Henry Weller's avatar Henry Weller
Browse files

etc/config.sh/CGAL: updated

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
parent 71da87b1
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Get CGAL and boost versions
. $WM_PROJECT_DIR/etc/config.sh/functions
_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
set -x
wmake -all blockMesh
......@@ -7,7 +13,7 @@ wmake -all extrude
wmake -all extrude2DMesh
wmake -all snappyHexMesh
if [ -n "$CGAL_ARCH_PATH" ]
if [ -n "$CGAL_ARCH_PATH" -o "$cgal_version" = "cgal-system" ]
then
foamyMesh/Allwmake
fi
......
......@@ -27,6 +27,12 @@
# 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
......@@ -35,29 +41,29 @@ cgal_version=CGAL-4.7
if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
then
common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
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
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 [ "$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" ]
then
_foamAddLib $CGAL_ARCH_PATH/lib
fi
if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ]
then
_foamAddLib $CGAL_ARCH_PATH/lib
fi
if [ -d "$BOOST_ARCH_PATH" ]
then
_foamAddLib $BOOST_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
unset boost_version cgal_version common_path
fi
......
......@@ -5,7 +5,12 @@ cd ${0%/*} || exit 1 # Run from this directory
targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
## get ZOLTAN_ARCH_PATH
# Get CGAL and scotch versions
. $WM_PROJECT_DIR/etc/config.sh/functions
_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
## Get ZOLTAN_ARCH_PATH
#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan`
#then
# . $settings
......@@ -21,7 +26,7 @@ set -x
wmake $targetType renumberMethods
if [ -n "$BOOST_ARCH_PATH" ]
if [ -n "$BOOST_ARCH_PATH" -o "$boost_version" = "boost-system" ]
then
wmake $targetType SloanRenumber
else
......
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