[cmake] Added mgis patch for suppressing no-missing-variable-declarat…

…ions
ufz · Jul 29, 2024 · eb37535 · eb37535
1 parent 975cd12
commit eb37535
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
@@ -171,7 +171,9 @@ if(OGS_USE_MFRONT)
             GIT_TAG rliv-2.0
             OPTIONS "enable-doxygen-doc OFF" "enable-fortran-bindings OFF"
                     "enable-website OFF"
-            EXCLUDE_FROM_ALL YES SYSTEM TRUE
+            EXCLUDE_FROM_ALL
+                YES SYSTEM TRUE PATCHES
+                    ${PROJECT_SOURCE_DIR}/scripts/cmake/mgis-flags.patch
         )
         list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
     endif()
@@ -355,7 +357,7 @@ if(NOT (GUIX_BUILD OR CONDA_BUILD))
     if((OGS_BUILD_TESTING OR OGS_BUILD_UTILS))
         CPMAddPackage(
             NAME vtkdiff GITHUB_REPOSITORY ufz/vtkdiff
-            GIT_TAG 9754b4da43c6adfb65d201ed920b5f6ea27b38b9
+            GIT_TAG 7cc474101bcee45804124df8010a2275022e2f3b
         )
         if(vtkdiff_ADDED)
             install(PROGRAMS $<TARGET_FILE:vtkdiff> DESTINATION bin)

diff --git a/scripts/cmake/mgis-flags.patch b/scripts/cmake/mgis-flags.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/common-compiler-flags.cmake b/cmake/modules/common-compiler-flags.cmake
+index 12fd730..bcc978b 100644
+--- a/cmake/modules/common-compiler-flags.cmake
++++ b/cmake/modules/common-compiler-flags.cmake
+@@ -61,8 +61,6 @@ else(enable-developer-warnings)
+   tfel_enable_cxx_compiler_flag(COMPILER_WARNINGS "Wno-missing-declarations")
+   tfel_enable_cxx_compiler_flag(COMPILER_WARNINGS "Wno-weak-vtables")
+   tfel_enable_cxx_compiler_flag(COMPILER_WARNINGS "Wno-unused-macros")
+-  tfel_enable_cxx_compiler_flag(COMPILER_WARNINGS
+-    "Wno-missing-variable-declarations")
+ endif(enable-developer-warnings)
+
+