COMP: Move boost and mpfr library includes from wmake/rules/general/CGAL

This is so that surfaceFeatureExtract will compile without boost/mpfr

applications/utilities/mesh/generation/cvMesh/Make/options

@@ -22,6 +22,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ldecompositionMethods \

applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options

@@ -19,6 +19,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -lconformalVoronoiMesh \
     -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \
     -ledgeMesh \

applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options

@@ -14,6 +14,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    -lboost_thread \
+    -lmpfr \
     -L$(FASTDUALOCTREE_SRC_PATH) -lperf_main \
     -lGL \
     -lconformalVoronoiMesh \

applications/utilities/surface/surfaceFeatureExtract/Allwmake

@@ -15,7 +15,9 @@ then
            CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \
            LAPACK_LIB=-llapack \
            BLAS_LIB=-lblas \
-           CGAL_LIB=-lCGAL"
+           CGAL_LIB=-lCGAL \
+           CGAL_BOOST_LIB=-lboost_thread \
+           CGAL_MPFR_LIB=-lmpfr"
 else
     echo
     echo "Compiling surfaceFeatureExtract without CGAL curvature support"

applications/utilities/surface/surfaceFeatureExtract/Make/options

@@ -15,6 +15,8 @@ EXE_INC = \
 
 EXE_LIBS = \
     $(CGAL_LIBS) \
+    ${CGAL_BOOST_LIB} \
+    ${CGAL_MPFR_LIB} \
     ${CGAL_LIBDIR} \
     ${LAPACK_LIB} \
     ${BLAS_LIB} \

wmake/rules/General/CGAL

@@ -7,6 +7,4 @@ CGAL_INC = \
 
 CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib \
-    -L$(BOOST_ARCH_PATH)/lib \
-    -lmpfr \
-    -lboost_thread
+    -L$(BOOST_ARCH_PATH)/lib