Title: [292528] trunk
- Revision
- 292528
- Author
- mrobin...@webkit.org
- Date
- 2022-04-07 03:57:36 -0700 (Thu, 07 Apr 2022)
Log Message
[GTK] Turning on the address sanitizer should disable GIR and documentation
https://bugs.webkit.org/show_bug.cgi?id=238868
Reviewed by Adrian Perez de Castro.
* Source/cmake/OptionsGTK.cmake: Disable documentation when the address
sanitizer is on. Documentation depends on GIR. Also fix the adjustment
of the documentation setting when building on Mac. This also has to
happen before the call to find_package(GI).
Modified Paths
Diff
Modified: trunk/ChangeLog (292527 => 292528)
--- trunk/ChangeLog 2022-04-07 10:15:35 UTC (rev 292527)
+++ trunk/ChangeLog 2022-04-07 10:57:36 UTC (rev 292528)
@@ -1,3 +1,15 @@
+2022-04-07 Martin Robinson <mrobin...@webkit.org>
+
+ [GTK] Turning on the address sanitizer should disable GIR and documentation
+ https://bugs.webkit.org/show_bug.cgi?id=238868
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Source/cmake/OptionsGTK.cmake: Disable documentation when the address
+ sanitizer is on. Documentation depends on GIR. Also fix the adjustment
+ of the documentation setting when building on Mac. This also has to
+ happen before the call to find_package(GI).
+
2022-04-04 Stephan Szabo <stephan.sz...@sony.com>
[PlayStation] Re-disable WebDriver
Modified: trunk/Source/cmake/OptionsGTK.cmake (292527 => 292528)
--- trunk/Source/cmake/OptionsGTK.cmake 2022-04-07 10:15:35 UTC (rev 292527)
+++ trunk/Source/cmake/OptionsGTK.cmake 2022-04-07 10:57:36 UTC (rev 292528)
@@ -276,6 +276,12 @@
SET_AND_EXPOSE_TO_BUILD(HAVE_GTK_UNIX_PRINTING ${GTK_UNIX_PRINT_FOUND})
SET_AND_EXPOSE_TO_BUILD(HAVE_OS_DARK_MODE_SUPPORT 1)
+# https://bugs.webkit.org/show_bug.cgi?id=182247
+if (ENABLED_COMPILER_SANITIZERS)
+ set(ENABLE_INTROSPECTION OFF)
+ set(ENABLE_DOCUMENTATION OFF)
+endif ()
+
# GUri is available in GLib since version 2.66, but we only want to use it if version is >= 2.67.1.
if (PC_GLIB_VERSION VERSION_GREATER "2.67.1" OR PC_GLIB_VERSION STREQUAL "2.67.1")
SET_AND_EXPOSE_TO_BUILD(HAVE_GURI 1)
@@ -494,11 +500,6 @@
endif ()
endif ()
-# https://bugs.webkit.org/show_bug.cgi?id=182247
-if (ENABLED_COMPILER_SANITIZERS)
- set(ENABLE_INTROSPECTION OFF)
-endif ()
-
# Override the cached variable, gtk-doc does not really work when building on Mac.
if (APPLE)
set(ENABLE_GTKDOC OFF)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
