Title: [290241] trunk
- Revision
- 290241
- Author
- [email protected]
- Date
- 2022-02-21 06:31:27 -0800 (Mon, 21 Feb 2022)
Log Message
[GTK][WPE] ANGLE: make USE_ANGLE_WEBGL build option public
https://bugs.webkit.org/show_bug.cgi?id=236962
Patch by Carlos Garcia Campos <[email protected]> on 2022-02-21
Reviewed by Chris Lord.
Since it introduces new dependencies, the build option should be public and a fatal error message should be
shown when the option is enabled and any for the dependencies is missing.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (290240 => 290241)
--- trunk/ChangeLog 2022-02-21 14:12:43 UTC (rev 290240)
+++ trunk/ChangeLog 2022-02-21 14:31:27 UTC (rev 290241)
@@ -1,3 +1,16 @@
+2022-02-21 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] ANGLE: make USE_ANGLE_WEBGL build option public
+ https://bugs.webkit.org/show_bug.cgi?id=236962
+
+ Reviewed by Chris Lord.
+
+ Since it introduces new dependencies, the build option should be public and a fatal error message should be
+ shown when the option is enabled and any for the dependencies is missing.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2022-02-20 Brandon Stewart <[email protected]>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/cmake/OptionsGTK.cmake (290240 => 290241)
--- trunk/Source/cmake/OptionsGTK.cmake 2022-02-21 14:12:43 UTC (rev 290240)
+++ trunk/Source/cmake/OptionsGTK.cmake 2022-02-21 14:31:27 UTC (rev 290241)
@@ -60,6 +60,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
@@ -75,7 +76,6 @@
# Private options specific to the GTK port. Changing these options is
# completely unsupported. They are intended for use only by WebKit developers.
-WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE ON)
WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS USE_OPENGL_OR_ES)
@@ -384,8 +384,15 @@
if (USE_ANGLE_WEBGL)
SET_AND_EXPOSE_TO_BUILD(USE_ANGLE TRUE)
- find_package(GBM REQUIRED)
- find_package(LibDRM REQUIRED)
+ find_package(GBM)
+ if (NOT GBM_FOUND)
+ message(FATAL_ERROR "GBM is needed for USE_ANGLE_WEBGL")
+ endif ()
+
+ find_package(LibDRM)
+ if (NOT LIBDRM_FOUND)
+ message(FATAL_ERROR "libdrm is needed for USE_ANGLE_WEBGL")
+ endif ()
endif ()
if (ENABLE_SPELLCHECK)
Modified: trunk/Source/cmake/OptionsWPE.cmake (290240 => 290241)
--- trunk/Source/cmake/OptionsWPE.cmake 2022-02-21 14:12:43 UTC (rev 290240)
+++ trunk/Source/cmake/OptionsWPE.cmake 2022-02-21 14:31:27 UTC (rev 290241)
@@ -75,6 +75,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE})
+WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(USE_AVIF "Whether to enable support for AVIF images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFINE(USE_JPEGXL "Whether to enable support for JPEG-XL images." PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON)
@@ -85,7 +86,6 @@
# Private options specific to the WPE port.
WEBKIT_OPTION_DEFINE(USE_GSTREAMER_HOLEPUNCH "Whether to enable GStreamer holepunch" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(USE_EXTERNAL_HOLEPUNCH "Whether to enable external holepunch" PRIVATE OFF)
-WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
WEBKIT_OPTION_DEFINE(USE_ATSPI "Whether to use the ATSPI a11y implementation instead of ATK." PRIVATE ON)
WEBKIT_OPTION_DEPEND(ENABLE_WEBGL2 USE_ANGLE_WEBGL)
@@ -177,8 +177,15 @@
if (USE_ANGLE_WEBGL)
SET_AND_EXPOSE_TO_BUILD(USE_ANGLE TRUE)
- find_package(GBM REQUIRED)
- find_package(LibDRM REQUIRED)
+ find_package(GBM)
+ if (NOT GBM_FOUND)
+ message(FATAL_ERROR "GBM is needed for USE_ANGLE_WEBGL")
+ endif ()
+
+ find_package(LibDRM)
+ if (NOT LIBDRM_FOUND)
+ message(FATAL_ERROR "libdrm is needed for USE_ANGLE_WEBGL")
+ endif ()
endif ()
if (USE_JPEGXL)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
