gcc: [skip ci] suppress gcc 10 warnings in smesh code

FreeCAD · Jun 8, 2020 · 42fcda5 · 42fcda5
1 parent f68f443
commit 42fcda5
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -6,37 +6,39 @@ SET(SMESH_VERSION_MINOR 7)
 SET(SMESH_VERSION_PATCH 1)
 SET(SMESH_VERSION_TWEAK 0)
 
+# Suppress gcc warnings
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment -Wno-unused-parameter -Wno-empty-body -Wno-pedantic")
-elseif(CMAKE_COMPILER_IS_CLANGXX)
-    set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-self-assign -Wno-sign-compare -Wno-logical-op-parentheses -Wno-reorder -Wno-switch -Wno-switch-enum -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-private-field")
-    set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-unused-function -Wno-sometimes-uninitialized -Wno-overloaded-virtual -Wno-dynamic-class-memaccess -Wno-comment -Wno-unused-parameter -Wno-extra-semi")
-endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable -Wno-unused-but-set-variable")
 
-if(CMAKE_COMPILER_IS_CLANGXX)
     unset(_flag_found CACHE)
-    check_cxx_compiler_flag("-Wno-deprecated-copy" _flag_found)
+    check_cxx_compiler_flag("-Wno-unused-result" _flag_found)
     if (_flag_found)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
     endif ()
 
     unset(_flag_found CACHE)
-    check_cxx_compiler_flag("-Wno-missing-field-initializers" _flag_found)
+    check_cxx_compiler_flag("-Wno-maybe-uninitialized" _flag_found)
     if (_flag_found)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
     endif ()
-elseif(CMAKE_COMPILER_IS_GNUCXX)
+
     unset(_flag_found CACHE)
-    check_cxx_compiler_flag("-Wno-unused-result" _flag_found)
+    check_cxx_compiler_flag("-Wno-missing-field-initializers" _flag_found)
     if (_flag_found)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
     endif ()
 
+# Suppress clang warnings
+elseif(CMAKE_COMPILER_IS_CLANGXX)
+    set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-self-assign -Wno-sign-compare -Wno-logical-op-parentheses -Wno-reorder -Wno-switch -Wno-switch-enum -Wno-unknown-pragmas -Wno-unused-variable -Wno-unused-private-field")
+    set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-unused-function -Wno-sometimes-uninitialized -Wno-overloaded-virtual -Wno-dynamic-class-memaccess -Wno-comment -Wno-unused-parameter -Wno-extra-semi")
+
     unset(_flag_found CACHE)
-    check_cxx_compiler_flag("-Wno-maybe-uninitialized" _flag_found)
+    check_cxx_compiler_flag("-Wno-deprecated-copy" _flag_found)
     if (_flag_found)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
     endif ()
 
     unset(_flag_found CACHE)
@@ -46,6 +48,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
     endif ()
 endif()
 
+
 if (VTK_OPTIONS)
     add_definitions(${VTK_OPTIONS})
 endif()