Changeset 162535 in webkit
- Timestamp:
- Jan 22, 2014 10:59:26 AM (10 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r162479 r162535 1 2014-01-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Avoid a circular dependency when building webkitenumtypes.h 4 https://bugs.webkit.org/show_bug.cgi?id=127199 5 6 Reviewed by Daniel Bates. 7 8 * PlatformGTK.cmake: Create a new list of headers consisting of all installed headers 9 except webkitenumtypes.h. Use this list when generating webkitenumtypes.h. 10 1 11 2014-01-21 Alex Christensen <achristensen@webkit.org> 2 12 -
trunk/Source/WebKit/PlatformGTK.cmake
r162243 r162535 155 155 ) 156 156 157 # To generate webkitenumtypes.h we want to use all installed headers, except webkitenumtypes.h itself. 158 set(WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_INSTALLED_HEADERS}) 159 list(REMOVE_ITEM WebKitGTK_ENUM_GENERATION_HEADERS ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/webkitenumtypes.h) 157 160 add_custom_command( 158 161 OUTPUT ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h 159 162 ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp 160 DEPENDS ${WebKitGTK_ INSTALLED_HEADERS}161 162 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.h163 164 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.cpp163 DEPENDS ${WebKitGTK_ENUM_GENERATION_HEADERS} 164 165 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 166 167 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 165 168 VERBATIM 166 169 )
Note: See TracChangeset
for help on using the changeset viewer.