From 6dc3a889dffca6acacaf2532958944cacccca4ed Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Jul 2015 21:38:25 +0100
Subject: [PATCH] Suppress compiler warnings from CGAL

---
 wmake/rules/linux64Clang/c++    | 2 +-
 wmake/rules/linux64Gcc/c++      | 2 +-
 wmake/rules/linuxARM7Gcc/c++    | 2 +-
 wmake/rules/linuxClang/c++      | 2 +-
 wmake/rules/linuxGcc/c++        | 2 +-
 wmake/rules/linuxIA64Gcc/c++    | 2 +-
 wmake/rules/linuxPPC64Gcc/c++   | 2 +-
 wmake/rules/linuxPPC64leGcc/c++ | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 300983dc58e..3fd8feeda64 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
 
 # Suppress CGAL warnings
-c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = clang++ -m64
 
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index 4b4f637e253..7f8f1b0cf97 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++ -m64
 
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
index 67bd5ff30c2..da35d7bfa13 100644
--- a/wmake/rules/linuxARM7Gcc/c++
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++
 
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index c3fe9e6d9c4..3fc4034ac25 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
 
 # Suppress CGAL warnings
-c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = clang++ -m32
 
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index 2ebcd45d5a1..634fc275067 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++ -m32
 
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index df6b4d8d17a..8e209efc876 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index 3dadf71c0b9..7e2fb083050 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++ -m64 -mcpu=power5+
 
diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 2e9ad46fe91..26f73ee79c6 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -3,7 +3,7 @@ SUFFIXES += .C
 c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
 
 # Suppress CGAL warnings
-c++CGALWARN =
+c++CGALWARN = -Wno-old-style-cast -Wno-unused-local-typedef
 
 CC          = g++ -m64 -mcpu=power8
 
-- 
GitLab