zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: SOURCE_CGAL_VERSIONS_ONLY workaround replaced in OpenFOAM

Browse Source 
Unset the _foamAddLib function prior to sourcing config.sh/CGAL

DOC: restriction about mixing ThirdParty and system gmp/mpfr
     does not apply anymore.
This commit is contained in:
mark
2016-06-17 16:59:53 +02:00
parent fde551c072
commit f09aa2ebdc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
makeCGAL
View File

@ -34,14 +34,13 @@
# simply specify a 'system' version. For example, # simply specify a 'system' version. For example,
# makeCGAL boost-system gmp-system # makeCGAL boost-system gmp-system
# #
# Mixing system and ThirdParty for gmp/mpfr is not supported.
#
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Get CGAL, boost and gmp/mpfr versions # Get CGAL, boost and gmp/mpfr versions
. $WM_PROJECT_DIR/etc/config.sh/functions . $WM_PROJECT_DIR/etc/config.sh/functions
_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \ unset _foamAddPath _foamAddLib _foamAddMan # get settings only
$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler) _foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
boostPACKAGE=${boost_version:-boost-system} boostPACKAGE=${boost_version:-boost-system}
@ -83,8 +82,6 @@ To override this behaviour (and use the system boost and/or gmp/mpfr),
simply specify a 'system' version. For example, simply specify a 'system' version. For example,
$Script boost-system gmp-system $Script boost-system gmp-system
Note: mixing system and ThirdParty for gmp/mpfr is not supported.
USAGE USAGE
exit 1 exit 1
} }