64d256f79e
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
49 lines
1022 B
Bash
Executable File
49 lines
1022 B
Bash
Executable File
#!/bin/sh
|
|
cd ${0%/*} || exit 1 # Run from this directory
|
|
|
|
# Parse arguments for library compilation
|
|
targetType=libso
|
|
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
|
|
|
|
# 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
|
|
# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
|
|
#else
|
|
# echo
|
|
# echo "Error: no config.sh/zoltan settings"
|
|
# echo
|
|
#fi
|
|
|
|
|
|
set -x
|
|
|
|
wmake $targetType renumberMethods
|
|
|
|
if [ -n "$BOOST_ARCH_PATH" -o "$boost_version" = "boost-system" ]
|
|
then
|
|
wmake $targetType SloanRenumber
|
|
else
|
|
echo
|
|
echo "Skipping SloanRenumber"
|
|
echo
|
|
fi
|
|
|
|
|
|
if [ -n "$ZOLTAN_ARCH_PATH" ]
|
|
then
|
|
wmake $targetType zoltanRenumber
|
|
else
|
|
echo
|
|
echo "Skipping zoltanRenumber"
|
|
echo
|
|
fi
|
|
|
|
#------------------------------------------------------------------------------
|