CMake: Update -Wno-misleading-indentation for CGAL

diff --git a/source/cgal/CMakeLists.txt b/source/cgal/CMakeLists.txt
index 08ea4ad6d6f8fdb0b86d61388efaa356772eb46b..da37863c324ff7f33437dfda74f7361270763941 100644 (file)
--- a/source/cgal/CMakeLists.txt
+++ b/source/cgal/CMakeLists.txt
@@ -13,6 +13,18 @@
 ##
 ## ---------------------------------------------------------------------
 
+#
+# We have to compile the "intersections.cc" file without the misleading
+# indentation warning enabled. Otherwise, we run into quite a number of
+# warnings with gcc, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549
+#
+if(DEAL_II_WITH_CGAL)
+  enable_if_supported(_flag "-Wno-misleading-indentation")
+  set_property(SOURCE "intersections.cc"
+    APPEND PROPERTY COMPILE_OPTIONS "${_flag}"
+    )
+endif()
+
 set(_src
   surface_mesh.cc
   intersections.cc

diff --git a/source/grid/CMakeLists.txt b/source/grid/CMakeLists.txt
index ff552164035fc6d9246dd7b20a52dfc10890d456..6cd29b439f84c622df892113f7d3af159005ec54 100644 (file)
--- a/source/grid/CMakeLists.txt
+++ b/source/grid/CMakeLists.txt
@@ -21,11 +21,12 @@
 # due to a longstanding bug in gcc. Thus, simply set
 # -Wno-misleading-indentation on the command line for the
 # grid_generator_cgal.cc compilation unit.
+# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549
 #
 if(DEAL_II_WITH_CGAL)
   enable_if_supported(_flag "-Wno-misleading-indentation")
-  set_property(SOURCE "grid_generator_cgal.cc"
-    APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flag}"
+  set_property(SOURCE "grid_generator_cgal.cc" "grid_tools.cc"
+    APPEND PROPERTY COMPILE_OPTIONS "${_flag}"
     )
 endif()