zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues 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
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