From 412317575df4d066f21093aaa68583bf8b950fc6 Mon Sep 17 00:00:00 2001
From: william <william>
Date: Tue, 28 Jan 2014 14:58:29 +0000
Subject: [PATCH] COMP: foamyHexMesh: move CGAL dependencies into rules

---
 .../utilities/mesh/generation/foamyHexMesh/Make/options       | 3 ---
 .../generation/foamyHexMesh/conformalVoronoiMesh/Make/files   | 2 --
 .../generation/foamyHexMesh/conformalVoronoiMesh/Make/options | 2 +-
 .../utilities/mesh/generation/foamyQuadMesh/Make/files        | 2 --
 .../utilities/mesh/generation/foamyQuadMesh/Make/options      | 4 ----
 wmake/rules/General/CGAL                                      | 4 +++-
 6 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options
index 256fa40164..b13ba99ab1 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/options
@@ -27,9 +27,6 @@ EXE_INC = \
     -IvectorTools
 
 EXE_LIBS = \
-    $(CGAL_LIBS) \
-    -lboost_thread \
-    -lmpfr \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ldecompositionMethods \
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
index 190b77775b..f22fb80e2a 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/files
@@ -1,5 +1,3 @@
-#include CGAL_FILES
-
 DelaunayMeshTools/DelaunayMeshTools.C
 
 conformalVoronoiMesh/indexedVertex/indexedVertexEnum.C
diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
index ac0dfdc4f8..9149d19f69 100644
--- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
@@ -6,7 +6,6 @@ CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/
 CGAL_INEXACT = -DCGAL_INEXACT
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
@@ -29,6 +28,7 @@ EXE_INC = \
     -I../vectorTools
 
 LIB_LIBS = \
+    ${CGAL_LIBS} \
     -lmeshTools \
     -ledgeMesh \
     -lfileFormats \
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/files b/applications/utilities/mesh/generation/foamyQuadMesh/Make/files
index 0434c90c66..5d1718383d 100755
--- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/files
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/files
@@ -1,5 +1,3 @@
-#include CGAL_FILES
-
 CV2D.C
 insertFeaturePoints.C
 insertSurfaceNearestPointPairs.C
diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
index b2bef6e578..7f87b67fed 100755
--- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options
@@ -3,7 +3,6 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_ARCH_PATH}/share/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
@@ -11,7 +10,6 @@ EXE_INC = \
     ${CGAL_INC} \
     ${c++CGALWARN} \
     -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
-/*    -I../cvMesh/vectorTools  */\
     -IconformalVoronoi2DMesh/lnInclude \
     -I$(FOAM_APP)/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
@@ -28,8 +26,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
-    -lboost_thread \
-    -lmpfr \
     -lextrude2DMesh \
     -lextrudeModel \
     -lcv2DMesh \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index ce87bd65a7..a8ec6ecb65 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -7,4 +7,6 @@ CGAL_INC = \
 CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib \
     -L$(GMP_ARCH_PATH)/lib \
-    -L$(BOOST_ARCH_PATH)/lib
+    -L$(BOOST_ARCH_PATH)/lib \
+    -L$(CGAL_ARCH_PATH)/lib \
+    -lCGAL