Title: [192095] trunk
- Revision
- 192095
- Author
- mcatanz...@igalia.com
- Date
- 2015-11-06 01:39:30 -0800 (Fri, 06 Nov 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (192094 => 192095)
--- trunk/ChangeLog 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/ChangeLog 2015-11-06 09:39:30 UTC (rev 192095)
@@ -1,3 +1,16 @@
+2015-11-06 Philip Chimento <philip.chime...@gmail.com> and Michael Catanzaro <mcatanz...@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-web...@cisra.canon.com.au>
Add runtime and compile time flags for enabling Web Animations API and model.
Modified: trunk/Source/cmake/FindGTK3.cmake (192094 => 192095)
--- trunk/Source/cmake/FindGTK3.cmake 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/Source/cmake/FindGTK3.cmake 2015-11-06 09:39:30 UTC (rev 192095)
@@ -5,6 +5,7 @@
# GTK3_INCLUDE_DIRS - the GTK+ 3. include directories
# 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
#
@@ -49,6 +50,11 @@
endif ()
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}")
set(GTK3_SUPPORTS_X11 TRUE)
Modified: trunk/Source/cmake/OptionsGTK.cmake (192094 => 192095)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-11-06 07:28:00 UTC (rev 192094)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-11-06 09:39:30 UTC (rev 192095)
@@ -71,6 +71,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
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})
WEBKIT_OPTION_DEFINE(USE_LIBNOTIFY "Whether to enable the default web notification implementation." PUBLIC ON)
@@ -186,6 +187,7 @@
# this point, and do not attempt to change any option after this point.
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})
@@ -392,6 +394,12 @@
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 ()
+
if (ENABLE_X11_TARGET)
if (NOT GTK3_SUPPORTS_X11)
message(FATAL_ERROR "Recompile GTK+ with X11 backend to use ENABLE_X11_TARGET")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
