From de847a553f9424381ca128dadd994bbdb98f6c9a Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 26 May 2020 12:01:40 +0200
Subject: [PATCH] gcc: suppress gcc warnings in smesh code

---
 src/3rdParty/salomesmesh/CMakeLists.txt        | 18 ++++++++++++++++++
 .../src/NETGENPlugin/NETGENPlugin_Mesher.cpp   |  4 ++++
 .../NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp    |  4 ++++
 .../NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp  |  4 ++++
 .../NETGENPlugin_NETGEN_2D_ONLY.cpp            |  4 ++++
 .../NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp    |  4 ++++
 6 files changed, 38 insertions(+)

diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
index f0532e8852..e9aac0e84d 100644
--- a/src/3rdParty/salomesmesh/CMakeLists.txt
+++ b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -20,6 +20,24 @@ if(CMAKE_COMPILER_IS_CLANGXX)
         set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
     endif ()
 
+    unset(_flag_found CACHE)
+    check_cxx_compiler_flag("-Wno-missing-field-initializers" _flag_found)
+    if (_flag_found)
+        set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
+    endif ()
+elseif(CMAKE_COMPILER_IS_GNUCXX)
+    unset(_flag_found CACHE)
+    check_cxx_compiler_flag("-Wno-unused-result" _flag_found)
+    if (_flag_found)
+        set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-unused-result")
+    endif ()
+
+    unset(_flag_found CACHE)
+    check_cxx_compiler_flag("-Wno-maybe-uninitialized" _flag_found)
+    if (_flag_found)
+        set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
+    endif ()
+
     unset(_flag_found CACHE)
     check_cxx_compiler_flag("-Wno-missing-field-initializers" _flag_found)
     if (_flag_found)
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
index d11d63ddb4..519fd546f9 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
@@ -87,6 +87,10 @@ namespace nglib {
 #undef NETGEN_PYTHON
 #endif
 
+#ifndef WIN32
+#undef DLL_HEADER
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <ngexception.hpp>
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
index ebd033112c..5dfe76bed4 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cpp
@@ -55,6 +55,10 @@ namespace nglib {
 #undef NETGEN_PYTHON
 #endif
 
+#ifndef WIN32
+#undef DLL_HEADER
+#endif
+
 #include <meshing.hpp>
 
 #if defined(__clang__)
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
index a86bf1882c..d9695c5640 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cpp
@@ -54,6 +54,10 @@ namespace nglib {
 #undef NETGEN_PYTHON
 #endif
 
+#ifndef WIN32
+#undef DLL_HEADER
+#endif
+
 #include <meshing.hpp>
 
 #if defined(__clang__)
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
index 0810dd962b..f824d834d8 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -72,6 +72,10 @@ namespace nglib {
 #undef NETGEN_PYTHON
 #endif
 
+#ifndef WIN32
+#undef DLL_HEADER
+#endif
+
 #include <occgeom.hpp>
 #include <meshing.hpp>
 //#include <meshing/meshtype.hpp>
diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
index aff7e74df1..6154b0482d 100644
--- a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
+++ b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
@@ -81,6 +81,10 @@
 #undef NETGEN_PYTHON
 #endif
 
+#ifndef WIN32
+#undef DLL_HEADER
+#endif
+
 #include <occgeom.hpp>
 
 #if defined(__clang__)