Title: [171988] trunk
- Revision
- 171988
- Author
- [email protected]
- Date
- 2014-08-04 00:17:55 -0700 (Mon, 04 Aug 2014)
Log Message
[GTK] Windowing target support should reflect the support in the GTK+ dependency
https://bugs.webkit.org/show_bug.cgi?id=134736
Reviewed by Martin Robinson.
* Source/cmake/FindGTK3.cmake: Don't error out if the GTK+ dependency doesn't
support the X11 or Wayland windowing targets -- instead, if there's no support
the specific target is disabled, and an error is thrown only if neither of the
backends is enabled at the end..
For now the X11 target remains enabled by default, and the Wayland target is
kept disabled. Once it's possible to have both targets enabled at runtime in
WebKit, the Wayland target will be enabled as well and we'll leave it to the
GTK+ dependency to determine which targets can be enabled.
Modified Paths
Diff
Modified: trunk/ChangeLog (171987 => 171988)
--- trunk/ChangeLog 2014-08-04 07:10:15 UTC (rev 171987)
+++ trunk/ChangeLog 2014-08-04 07:17:55 UTC (rev 171988)
@@ -1,5 +1,21 @@
2014-08-04 Zan Dobersek <[email protected]>
+ [GTK] Windowing target support should reflect the support in the GTK+ dependency
+ https://bugs.webkit.org/show_bug.cgi?id=134736
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindGTK3.cmake: Don't error out if the GTK+ dependency doesn't
+ support the X11 or Wayland windowing targets -- instead, if there's no support
+ the specific target is disabled, and an error is thrown only if neither of the
+ backends is enabled at the end..
+ For now the X11 target remains enabled by default, and the Wayland target is
+ kept disabled. Once it's possible to have both targets enabled at runtime in
+ WebKit, the Wayland target will be enabled as well and we'll leave it to the
+ GTK+ dependency to determine which targets can be enabled.
+
+2014-08-04 Zan Dobersek <[email protected]>
+
[CMake] Add FindWayland.cmake
https://bugs.webkit.org/show_bug.cgi?id=135540
Modified: trunk/Source/cmake/FindGTK3.cmake (171987 => 171988)
--- trunk/Source/cmake/FindGTK3.cmake 2014-08-04 07:10:15 UTC (rev 171987)
+++ trunk/Source/cmake/FindGTK3.cmake 2014-08-04 07:17:55 UTC (rev 171988)
@@ -48,16 +48,21 @@
if (GTK3_VERSION AND VERSION_OK AND ENABLE_X11_TARGET)
pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
if (NOT("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
- set(VERSION_OK FALSE)
+ set(ENABLE_X11_TARGET OFF)
endif ()
endif ()
if (GTK3_VERSION AND VERSION_OK AND ENABLE_WAYLAND_TARGET)
pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
if (NOT("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
- set(VERSION_OK FALSE)
+ set(ENABLE_WAYLAND_TARGET OFF)
endif ()
endif ()
+if (NOT(ENABLE_X11_TARGET OR ENABLE_WAYLAND_TARGET))
+ message(FATAL_ERROR "At least one of the following windowing targets must "
+ "be enabled and also supported by the GTK+ dependency: X11, Wayland")
+endif ()
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
