From 35e6c03eabef60af632c5abaf5774bb234f25337 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 21 Jun 2016 19:47:46 +0100
Subject: [PATCH] foamyMesh: Simplify support for system CGAL installation
---
.../generation/foamyMesh/conformalVoronoiMesh/Make/options | 3 +--
.../mesh/generation/foamyMesh/foamyQuadMesh/Make/options | 3 +--
wmake/rules/General/CGAL | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
index d2bdc98f84..c935426f09 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options
@@ -23,8 +23,7 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
- -IPrintTable \
- -I/usr/include
+ -IPrintTable
LIB_LIBS = \
${CGAL_LIBS} \
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index 1dace00f1e..904dd290a9 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -21,8 +21,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
- -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
- -I/usr/include
+ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
EXE_LIBS = \
$(CGAL_LIBS) \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 4bade675a2..8097684eee 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -2,7 +2,8 @@ CGAL_INC = \
-I$(CGAL_ARCH_PATH)/include \
-I$(MPFR_ARCH_PATH)/include \
-I$(GMP_ARCH_PATH)/include \
- -I$(BOOST_ARCH_PATH)/include
+ -I$(BOOST_ARCH_PATH)/include \
+ -I/usr/include
CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
--
GitLab