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: foamyHexMesh: move CGAL dependencies into rules

Browse Source
This commit is contained in:
william
2014-01-28 14:58:29 +00:00
parent aaa1a3dcd6
commit 412317575d
6 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/mesh/generation/foamyHexMesh/Make/options
View File

@ -27,9 +27,6 @@ EXE_INC = \
-IvectorTools -IvectorTools
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \
-lboost_thread \
-lmpfr \
-lconformalVoronoiMesh \ -lconformalVoronoiMesh \
-lmeshTools \ -lmeshTools \
-ldecompositionMethods \ -ldecompositionMethods \

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
View File

@ -1,5 +1,3 @@
#include CGAL_FILES
DelaunayMeshTools/DelaunayMeshTools.C DelaunayMeshTools/DelaunayMeshTools.C
conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
View File

@ -6,7 +6,6 @@ CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/
CGAL_INEXACT = -DCGAL_INEXACT CGAL_INEXACT = -DCGAL_INEXACT
include $(GENERAL_RULES)/CGAL include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
EXE_INC = \ EXE_INC = \
${EXE_FROUNDING_MATH} \ ${EXE_FROUNDING_MATH} \
@ -29,6 +28,7 @@ EXE_INC = \
-I../vectorTools -I../vectorTools
LIB_LIBS = \ LIB_LIBS = \
${CGAL_LIBS} \
-lmeshTools \ -lmeshTools \
-ledgeMesh \ -ledgeMesh \
-lfileFormats \ -lfileFormats \

2
applications/utilities/mesh/generation/foamyQuadMesh/Make/files
View File

@ -1,5 +1,3 @@
#include CGAL_FILES
CV2D.C CV2D.C
insertFeaturePoints.C insertFeaturePoints.C
insertSurfaceNearestPointPairs.C insertSurfaceNearestPointPairs.C

4
applications/utilities/mesh/generation/foamyQuadMesh/Make/options
View File

@ -3,7 +3,6 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
EXE_INC = \ EXE_INC = \
${EXE_FROUNDING_MATH} \ ${EXE_FROUNDING_MATH} \
@ -11,7 +10,6 @@ EXE_INC = \
${CGAL_INC} \ ${CGAL_INC} \
${c++CGALWARN} \ ${c++CGALWARN} \
-I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \ -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
/* -I../cvMesh/vectorTools */\
-IconformalVoronoi2DMesh/lnInclude \ -IconformalVoronoi2DMesh/lnInclude \
-I$(FOAM_APP)/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \ -I$(FOAM_APP)/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
@ -28,8 +26,6 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
$(CGAL_LIBS) \ $(CGAL_LIBS) \
-lboost_thread \
-lmpfr \
-lextrude2DMesh \ -lextrude2DMesh \
-lextrudeModel \ -lextrudeModel \
-lcv2DMesh \ -lcv2DMesh \

4
wmake/rules/General/CGAL
View File

@ -7,4 +7,6 @@ CGAL_INC = \
CGAL_LIBS = \ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \ -L$(MPFR_ARCH_PATH)/lib \
-L$(GMP_ARCH_PATH)/lib \ -L$(GMP_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib -L$(BOOST_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib \
-lCGAL