From 3c86995198f82f17ec02bee4a70c82d7bd367dea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 30 Sep 2016 17:00:05 +0200
Subject: [PATCH] COMP: remove boost/mpfr/gmp linkage for foamyMesh components.

- CGAL itself includes its library dependencies, we only need to
  provide the -L... option to the proper ThirdParty locations.

  Should help improve general build robustness.
---
 .../generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options | 2 --
 .../foamyMesh/foamyHexMeshBackgroundMesh/Make/options          | 3 ---
 .../foamyMesh/foamyHexMeshSurfaceSimplify/Make/options         | 2 --
 wmake/rules/General/CGAL                                       | 3 +--
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
index f9a4d17aaf..aa1ba3b9bb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
@@ -25,8 +25,6 @@ EXE_INC =  \
 
 EXE_LIBS =  \
     $(CGAL_LIBS) \
-    -lmpfr \
-    -lboost_thread \
     -lconformalVoronoiMesh \
     -lfiniteVolume    \
     -lmeshTools \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
index c7c5ebdb07..625763f597 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options
@@ -22,9 +22,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
-    -lboost_thread \
-    -lmpfr \
-    -lgmp \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
     -ldecompose \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
index 5cb1f8676d..1a24c89f70 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options
@@ -16,8 +16,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
-    -lboost_thread \
-    -lmpfr \
     -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
     -lGL \
     -lconformalVoronoiMesh \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 8097684eee..fd1965e656 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -10,5 +10,4 @@ CGAL_LIBS = \
     -L$(GMP_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
     -L$(BOOST_ARCH_PATH)/lib \
     -L$(CGAL_ARCH_PATH)/lib \
-    -lCGAL \
-    -lmpfr
+    -lCGAL