Changeset 205294 in webkit

Timestamp:

Sep 1, 2016 10:31:59 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix configuration without wayland support
​https://bugs.webkit.org/show_bug.cgi?id=161475

WebKit2WaylandClientProtocol.c is a derived source that is created
conditionally on ENABLE_WAYLAND_TARGET. It was being included
in the sources list unconditionally, so configure failed whenever
wayland support was unavailable.

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-09-01
Reviewed by Žan Doberšek.

• PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-01  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        [GTK] Fix configuration without wayland support
+        https://bugs.webkit.org/show_bug.cgi?id=161475
+
+        WebKit2WaylandClientProtocol.c is a derived source that is created
+        conditionally on ENABLE_WAYLAND_TARGET.  It was being included
+        in the sources list unconditionally, so configure failed whenever
+        wayland support was unavailable.
+
+        Reviewed by Žan Doberšek.
+
+        * PlatformGTK.cmake: Include WebKit2WaylandClientProtocol.c in source list conditional on ENABLE_WAYLAND_TARGET
+
 2016-08-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -556 +556 @@
     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
     ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
-    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
 
     ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
     ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
 )
+
+if (ENABLE_WAYLAND_TARGET)
+    list(APPEND WebKit2_DERIVED_SOURCES
+        ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2WaylandClientProtocol.c
+    )
+endif ()
 
 set(WebKit2GTK_INSTALLED_HEADERS