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

COMP: Boost and CGAL environment.

Browse Source 
Targeting all building and linking to CGAL and boost installed to
$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER.

Reverting to CGAL 3.5.1, waiting for 3.6.1 - problem in 3.6 with boost
1.42.0.

Removing MPFR_HOME variable, not needed as include and link is done
with the $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
versions.
This commit is contained in:
graham 2010-03-24 13:33:29 +00:00
parent 8d1af0a2ba
commit 829c30733d
6 changed files with 22 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
applications/utilities/mesh/generation/CV2DMesher/Make/options
View File

@ -1,26 +1,21 @@
// EXE_DEBUG = -DFULLDEBUG -g -O0
//EXE_DEBUG = -DFULLDEBUG -g -O0
EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
-I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
-L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
$(CGAL_LIBS) \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \
-lboost_thread \
-lmpfr
-ldynamicMesh

10
applications/utilities/mesh/generation/CV3DMesher/Make/options
View File

@ -3,23 +3,19 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
-I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
-L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
$(CGAL_LIBS) \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \
-lboost_thread \
-lmpfr
-ldynamicMesh

13
etc/settings.csh
View File

@ -85,21 +85,18 @@ case OpenFOAM:
switch ("$WM_COMPILER")
case Gcc:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.2
setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
breaksw
case Gcc442:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1
setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
breaksw
case Gcc43:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1
setenv MPFR_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
@ -267,14 +264,14 @@ endif
# CGAL and boost
# ~~~~~~~~~~~~~~
set cgal_version=3.6
setenv CGAL_SRC $WM_THIRD_PARTY_DIR/CGAL-$cgal_version
set cgal_version=3.5.1
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/CGAL-$cgal_version
set boost_version=1_42_0
setenv BOOST_ROOT $WM_THIRD_PARTY_DIR/boost_$boost_version
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/boost_$boost_version
_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
_foamAddLib $CGAL_SRC/lib
_foamAddLib $BOOST_ARCH_PATH/lib
_foamAddLib $CGAL_ARCH_PATH/lib
unset cgal_version boost_version

14
etc/settings.sh
View File

@ -113,28 +113,24 @@ OpenFOAM)
case "$WM_COMPILER" in
Gcc)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.3
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.2
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-5.0.1/lib
;;
Gcc442)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
;;
Gcc44)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.4.2
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
;;
Gcc43)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-4.3.3
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/mpfr-2.4.1
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gmp-4.2.4/lib
@ -311,14 +307,14 @@ export MPI_BUFFER_SIZE
# CGAL and boost
# ~~~~~~~~~~~~~~
cgal_version=3.6
export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
cgal_version=3.5.1
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/CGAL-$cgal_version
boost_version=1_42_0
export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/boost_$boost_version
_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
_foamAddLib $CGAL_SRC/lib
_foamAddLib $BOOST_ARCH_PATH/lib
_foamAddLib $CGAL_ARCH_PATH/lib
unset cgal_version boost_version

2
src/mesh/conformalVoronoiMesh/Make/options
View File

@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \

8
wmake/rules/General/CGAL
View File

@ -1,11 +1,11 @@
CGAL_INC = \
-Wno-old-style-cast \
-I${CGAL_SRC}/include \
-I$(MPFR_HOME) \
-I${BOOST_ROOT}/include/boost
-I${CGAL_ARCH_PATH}/include \
-I$(MPFR_ARCH_PATH)/include \
-I${BOOST_ARCH_PATH}/include/boost
CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \
-L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-L$(BOOST_ARCH_PATH)/lib \
-lmpfr \
-lboost_thread