Modifying options for building with boost to make sure that the ThirdParty

version is being used.

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

@@ -3,7 +3,6 @@ EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
 include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
 
 EXE_INC = \
     ${EXE_FROUNDING_MATH} \
@@ -18,12 +17,14 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/lib \
     -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
+    -L$(BOOST_ROOT)/lib \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ledgeMesh \
     -ltriSurface \
     -ldynamicMesh \
-    -lboost_thread-gcc43-mt-1_38 \
+    -lmpfr \
-    -lmpfr
+    -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION}
+
+

src/conformalVoronoiMesh/Make/options

@@ -17,11 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_ROOT)/lib \
-    -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
     -lmeshTools \
     -ledgeMesh \
     -ltriSurface \
-    -ldynamicMesh \
+    -ldynamicMesh
-    -lboost_thread-gcc43-mt-1_38 \
-    -lmpfr

wmake/rules/General/CGAL

@@ -3,4 +3,5 @@ CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
 CGAL_INC = \
     -Wno-old-style-cast \
     -I${CGAL_SRC}/include \
-    -I${CGAL_PATH}
+    -I${CGAL_PATH} \
+    -I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}