Commit 77b995e8 authored by mrobinson@webkit.org's avatar mrobinson@webkit.org

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162535 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2b1f295b
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>
Unreviewed build fix for Win64.
......
......@@ -154,14 +154,17 @@ add_custom_command(
VERBATIM
)
# 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}
DEPENDS ${WebKitGTK_ENUM_GENERATION_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.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_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
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
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment