Changeset 192095 in webkit

Timestamp:

Nov 6, 2015 1:39:30 AM (8 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Re-enable Quartz backend on cmake build system
​https://bugs.webkit.org/show_bug.cgi?id=144561

Reviewed by Philippe Normand.

• Source/cmake/FindGTK3.cmake: Set GTK3_SUPPORTS_QUARTZ based on

the presence of of gtk+-quartz-3.0 module.

• Source/cmake/OptionsGTK.cmake: Reintroduce the

ENABLE_QUARTZ_TARGET option to the CMake build, for building the
GTK+ Quartz backend on OS X.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/FindGTK3.cmake (modified) (2 diffs)
• Source/cmake/OptionsGTK.cmake (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2015-11-06  Philip Chimento  <philip.chimento@gmail.com> and Michael Catanzaro <mcatanzaro@igalia.com>
+
+        [GTK] Re-enable Quartz backend on cmake build system
+        https://bugs.webkit.org/show_bug.cgi?id=144561
+
+        Reviewed by Philippe Normand.
+
+        * Source/cmake/FindGTK3.cmake: Set GTK3_SUPPORTS_QUARTZ based on
+        the presence of of gtk+-quartz-3.0 module.
+        * Source/cmake/OptionsGTK.cmake: Reintroduce the
+        ENABLE_QUARTZ_TARGET option to the CMake build, for building the
+        GTK+ Quartz backend on OS X.
+
 2015-11-05  Nikos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
 

trunk/Source/cmake/FindGTK3.cmake

@@ -6 +6 @@
 #  GTK3_LIBRARIES - link these to use GTK+ 3.
 #  GTK3_SUPPORTS_GESTURES - GTK+ supports gestures (GTK+ >= 3.14)
+#  GTK3_SUPPORTS_QUARTZ - GTK+ supports Quartz backend
 #  GTK3_SUPPORTS_X11 - GTK+ supports X11 backend
 #  GTK3_SUPPORTS_WAYLAND - GTK+ supports Wayland backend
@@ -50 +51 @@
 
 if (GTK3_VERSION AND VERSION_OK)
+    pkg_check_modules(GTK3_QUARTZ gtk+-quartz-3.0)
+    if ("${GTK3_QUARTZ_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")
+        set(GTK3_SUPPORTS_QUARTZ TRUE)
+    endif ()
+
     pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
     if ("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}")

trunk/Source/cmake/OptionsGTK.cmake

@@ -72 +72 @@
 WEBKIT_OPTION_DEFINE(ENABLE_OPENGL "Whether to use OpenGL." PUBLIC ON)
 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." PUBLIC ON)
+WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK3_SUPPORTS_QUARTZ})
 WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK3_SUPPORTS_X11})
 WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ${GTK3_SUPPORTS_WAYLAND})
@@ -187 +188 @@
 WEBKIT_OPTION_END()
 
+SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_QUARTZ ${ENABLE_QUARTZ_TARGET})
 SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_X11 ${ENABLE_X11_TARGET})
 SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
@@ -391 +393 @@
 
     SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
+endif ()
+
+if (ENABLE_QUARTZ_TARGET)
+    if (NOT GTK3_SUPPORTS_QUARTZ)
+        message(FATAL_ERROR "Recompile GTK+ with Quartz backend to use ENABLE_QUARTZ_TARGET")
+    endif ()
 endif ()