From 901bd023c31e28fb36d2045a7feaf2ea66f2102f Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 28 May 2009 17:35:47 +0100
Subject: [PATCH] Modifying options for building with boost to make sure that
the ThirdParty version is being used.
---
.../utilities/mesh/generation/cvMesh/Make/options | 9 +++++----
src/conformalVoronoiMesh/Make/options | 6 +-----
wmake/rules/General/CGAL | 3 ++-
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index ba06a95ed41..fca28f43376 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/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}
+
+
diff --git a/src/conformalVoronoiMesh/Make/options b/src/conformalVoronoiMesh/Make/options
index c0f96a7b9ae..9168d12c6ed 100644
--- a/src/conformalVoronoiMesh/Make/options
+++ b/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 \
- -lboost_thread-gcc43-mt-1_38 \
- -lmpfr
+ -ldynamicMesh
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index dac5f5f6e28..1429a755258 100644
--- a/wmake/rules/General/CGAL
+++ b/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}
\ No newline at end of file
+ -I${CGAL_PATH} \
+ -I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}
--
GitLab