Changeset 162535 in webkit

Timestamp:

Jan 22, 2014 10:59:26 AM (10 years ago)

Author:

Martin Robinson

Message:

[GTK] Avoid a circular dependency when building webkitenumtypes.h
​https://bugs.webkit.org/show_bug.cgi?id=127199

Reviewed by Daniel Bates.

• PlatformGTK.cmake: Create a new list of headers consisting of all installed headers

except webkitenumtypes.h. Use this list when generating webkitenumtypes.h.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2014-01-22  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Avoid a circular dependency when building webkitenumtypes.h
+        https://bugs.webkit.org/show_bug.cgi?id=127199
+
+        Reviewed by Daniel Bates.
+
+        * PlatformGTK.cmake: Create a new list of headers consisting of all installed headers
+        except webkitenumtypes.h. Use this list when generating webkitenumtypes.h.
+
 2014-01-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -155 +155 @@
 )
 
+# To generate webkitenumtypes.h we want to use all installed headers, except webkitenumtypes.h itself.
+set(WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_INSTALLED_HEADERS})
+list(REMOVE_ITEM WebKitGTK_ENUM_GENERATION_HEADERS ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/webkitenumtypes.h)
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
            ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
-    DEPENDS ${WebKitGTK_INSTALLED_HEADERS}
-
-    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.h.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
-
-    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
+    DEPENDS ${WebKitGTK_ENUM_GENERATION_HEADERS}
+
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.h.template ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
+
+    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
     VERBATIM
 )