zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CGAL: Upgraded to 4.10

Browse Source
This commit is contained in:
Henry Weller
2017-07-28 08:28:38 +01:00
parent 3ece3e9e81
commit 4d892f4579
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etc/config.csh/CGAL
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -38,7 +38,7 @@
set boost_version=boost-system set boost_version=boost-system
set cgal_version=cgal-system set cgal_version=cgal-system
#set cgal_version=CGAL-4.8 #cgal_version=CGAL-4.10
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
@ -49,14 +49,14 @@ if ($?FOAM_VERBOSE && $?prompt) then
echo " $boost_version at $BOOST_ARCH_PATH" echo " $boost_version at $BOOST_ARCH_PATH"
endif endif
if ( -d "$CGAL_ARCH_PATH" && "$cgal_version" != "cgal-system" ) then
_foamAddLib $CGAL_ARCH_PATH/lib
endif
if ( -d "$BOOST_ARCH_PATH" && "$boost_version" != "boost-system" ) then if ( -d "$BOOST_ARCH_PATH" && "$boost_version" != "boost-system" ) then
_foamAddLib $BOOST_ARCH_PATH/lib _foamAddLib $BOOST_ARCH_PATH/lib
endif endif
if ( -d "$CGAL_ARCH_PATH" && "$cgal_version" != "cgal-system" ) then
_foamAddLib $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
endif
unset boost_version cgal_version unset boost_version cgal_version
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

6
etc/config.sh/CGAL
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -37,7 +37,7 @@
boost_version=boost-system boost_version=boost-system
cgal_version=cgal-system cgal_version=cgal-system
#cgal_version=CGAL-4.8.1 #cgal_version=CGAL-4.10
thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
@ -57,7 +57,7 @@ then
export CGAL_ARCH_PATH=$thirdPartyPath/$cgal_version export CGAL_ARCH_PATH=$thirdPartyPath/$cgal_version
if [ -d "$CGAL_ARCH_PATH" ] if [ -d "$CGAL_ARCH_PATH" ]
then then
_foamAddLib $CGAL_ARCH_PATH/lib _foamAddLib $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
fi fi
else else
unset CGAL_ARCH_PATH unset CGAL_ARCH_PATH

2
wmake/rules/General/CGAL
View File

@ -9,6 +9,6 @@ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(BOOST_ARCH_PATH)/lib \ -L$(BOOST_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib \ -L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lCGAL \ -lCGAL \
-lmpfr -lmpfr