songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: Correcting CGAL/boost/GMP build setup.

Browse Source
This commit is contained in:
graham 2011-02-18 16:18:46 +00:00
parent a3b1263184
commit 0fac475adb
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/settings.csh
View File

@ -84,7 +84,7 @@ _foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_L
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
unset gcc_version gmp_version mpfr_version mpc_version unset gcc_version gmp_version mpfr_version mpc_version
unsetenv MPFR_ARCH_PATH unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
# Location of compiler installation # Location of compiler installation
@ -178,6 +178,7 @@ case ThirdParty:
# used by boost/CGAL: # used by boost/CGAL:
setenv MPFR_ARCH_PATH $mpfrDir setenv MPFR_ARCH_PATH $mpfrDir
setenv GMP_ARCH_PATH $gmpDir
endif endif
unset gcc_version gccDir unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
@ -243,7 +244,7 @@ if ( -d "$CGAL_ARCH_PATH" ) then
endif endif
_foamAddLib $CGAL_ARCH_PATH/lib _foamAddLib $CGAL_ARCH_PATH/lib
else else
unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
endif endif
unset boost_version cgal_version unset boost_version cgal_version

5
etc/settings.sh
View File

@ -107,7 +107,7 @@ _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
unset gcc_version gmp_version mpfr_version mpc_version unset gcc_version gmp_version mpfr_version mpc_version
unset MPFR_ARCH_PATH unset MPFR_ARCH_PATH GMP_ARCH_PATH
# Location of compiler installation # Location of compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -198,6 +198,7 @@ OpenFOAM | ThirdParty)
# used by boost/CGAL: # used by boost/CGAL:
export MPFR_ARCH_PATH=$mpfrDir export MPFR_ARCH_PATH=$mpfrDir
export GMP_ARCH_PATH=$gmpDir
fi fi
unset gcc_version gccDir unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
@ -264,7 +265,7 @@ then
fi fi
_foamAddLib $CGAL_ARCH_PATH/lib _foamAddLib $CGAL_ARCH_PATH/lib
else else
unset BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH unset BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
fi fi
unset boost_version cgal_version unset boost_version cgal_version

3
wmake/rules/General/CGAL
View File

@ -2,7 +2,8 @@ CGAL_INC = \
-Wno-old-style-cast \ -Wno-old-style-cast \
-I$(CGAL_ARCH_PATH)/include \ -I$(CGAL_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \ -I$(MPFR_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include/boost -I$(GMP_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include
CGAL_LIBS = \ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \ -L$(MPFR_ARCH_PATH)/lib \