From 00128075bbf96f0f00864d1dff39565e8be442b8 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 26 Sep 2013 11:36:13 +0100 Subject: [PATCH] COMP: foamy: suppress cgal generated warnings --- .../utilities/mesh/generation/foamyHexMesh/Make/options | 1 + .../generation/foamyHexMesh/conformalVoronoiMesh/Make/options | 1 + .../utilities/mesh/generation/foamyQuadMesh/Make/options | 1 + wmake/rules/linux64Clang/c++ | 3 +++ wmake/rules/linuxClang/c++ | 3 +++ 5 files changed, 9 insertions(+) diff --git a/applications/utilities/mesh/generation/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/Make/options index f03dbf9097..c40ac7b7a4 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/Make/options @@ -12,6 +12,7 @@ EXE_INC = \ ${EXE_NDEBUG} \ ${CGAL_INEXACT} \ ${CGAL_INC} \ + ${c++CGALWARN} \ -IconformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options index 2be5855323..a03166138e 100644 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options @@ -13,6 +13,7 @@ EXE_INC = \ ${EXE_NDEBUG} \ ${CGAL_INEXACT} \ ${CGAL_INC} \ + ${c++CGALWARN} \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options index 62aec78cdb..7c52fa131a 100755 --- a/applications/utilities/mesh/generation/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyQuadMesh/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ ${EXE_FROUNDING_MATH} \ ${EXE_NDEBUG} \ ${CGAL_INC} \ + ${c++CGALWARN} \ -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \ -I../cvMesh/vectorTools \ -IconformalVoronoi2DMesh/lnInclude \ diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++ index 1f78395afb..8b7d486341 100644 --- a/wmake/rules/linux64Clang/c++ +++ b/wmake/rules/linux64Clang/c++ @@ -3,6 +3,9 @@ # -Woverloaded-virtual may produce spurious warnings, disable for now c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison + +c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags + CC = clang++ -m64 include $(RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++ index 7ae53634e5..c60b5c79e6 100644 --- a/wmake/rules/linuxClang/c++ +++ b/wmake/rules/linuxClang/c++ @@ -3,6 +3,9 @@ # -Woverloaded-virtual may produce spurious warnings, disable for now c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison + +c++CGALWARN = -Wno-c++11-extensions -Wno-sometimes-uninitialized -Wno-mismatched-tags + CC = clang++ -m32 include $(RULES)/c++$(WM_COMPILE_OPTION)