Skip to content
Snippets Groups Projects
Commit 08488007 authored by graham's avatar graham
Browse files

COMP: CGAL and boost build and environment options.

parent e09a140a
No related merge requests found
Hide whitespace changes
Inline Side-by-side
applications/utilities/mesh/generation/cvMesh/Make/options
+ 1
− 3
View file @ 08488007
......@@ -8,7 +8,6 @@ EXE_INC = \
${EXE_FROUNDING_MATH} \
${EXE_NDEBUG} \
${CGAL_INC} \
-I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
-I$(LIB_SRC)/mesh/conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
......@@ -17,8 +16,7 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
$(CGAL_LIBS) \
-lconformalVoronoiMesh \
-lmeshTools \
-ledgeMesh \
......
etc/settings.csh
+ 21
− 8
View file @ 08488007
......@@ -88,17 +88,23 @@ case OpenFOAM:
switch ("$WM_COMPILER")
case Gcc:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc442:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc43:
setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
breaksw
case Gcc42:
......@@ -245,11 +251,18 @@ else
endif
# CGAL library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~
if ( $?CGAL_LIB_DIR ) then
_foamAddLib $CGAL_LIB_DIR
endif
# CGAL and boost
# ~~~~~~~~~~~~~~
set cgal_version=3.5.1
setenv CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
set boost_version=1_42_0
setenv BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
_foamAddLib $CGAL_SRC/lib
unset cgal_version boost_version
# Switch on the hoard memory allocator if available
......
etc/settings.sh
+ 23
− 7
View file @ 08488007
......@@ -112,22 +112,30 @@ OpenFOAM)
case "$WM_COMPILER" in
Gcc)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc442)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc44)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc43)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $MPFR_ARCH_PATH/lib
_foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
;;
Gcc42)
......@@ -281,10 +289,18 @@ fi
export MPI_BUFFER_SIZE
# CGAL library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~
[ -d "$CGAL_LIB_DIR" ] && _foamAddLib $CGAL_LIB_DIR
# CGAL and boost
# ~~~~~~~~~~~~~~
cgal_version=3.5.1
export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
boost_version=1_42_0
export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
_foamAddLib $CGAL_SRC/lib
unset cgal_version boost_version
# Switch on the hoard memory allocator if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
src/mesh/conformalVoronoiMesh/Make/options
+ 0
− 1
View file @ 08488007
......@@ -9,7 +9,6 @@ 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)/edgeMesh/lnInclude \
......
wmake/rules/General/CGAL
+ 8
− 1
View file @ 08488007
CGAL_INC = \
-Wno-old-style-cast \
-I${CGAL_SRC}/include \
-I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}
-I$(MPFR_HOME) \
-I${BOOST_ROOT}/include/boost
CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \
-L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-lmpfr \
-lboost_thread
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment