Title: [174671] trunk/Source/WebKit2
- Revision
- 174671
- Author
- [email protected]
- Date
- 2014-10-13 23:58:15 -0700 (Mon, 13 Oct 2014)
Log Message
[GTK][CMake] Non-ninja build is broken since r174422
https://bugs.webkit.org/show_bug.cgi?id=137656
Reviewed by Philippe Normand.
Make WebKit2-forwarding-headers depend only on static,
non-generated sources.
* CMakeLists.txt:
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (174670 => 174671)
--- trunk/Source/WebKit2/CMakeLists.txt 2014-10-14 04:43:53 UTC (rev 174670)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-10-14 06:58:15 UTC (rev 174671)
@@ -685,11 +685,11 @@
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
+GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
add_definitions(-DBUILDING_WEBKIT)
include_directories(${WebKit2_INCLUDE_DIRECTORIES})
-add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
+add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
add_dependencies(WebKit2 WebCore)
add_dependencies(WebKit2 ${WEBKIT2_EXTRA_DEPENDENCIES})
Modified: trunk/Source/WebKit2/ChangeLog (174670 => 174671)
--- trunk/Source/WebKit2/ChangeLog 2014-10-14 04:43:53 UTC (rev 174670)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-14 06:58:15 UTC (rev 174671)
@@ -1,3 +1,16 @@
+2014-10-13 Carlos Garcia Campos <[email protected]>
+
+ [GTK][CMake] Non-ninja build is broken since r174422
+ https://bugs.webkit.org/show_bug.cgi?id=137656
+
+ Reviewed by Philippe Normand.
+
+ Make WebKit2-forwarding-headers depend only on static,
+ non-generated sources.
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+
2014-10-13 Chris Dumez <[email protected]>
Use is<>() / downcast<>() for PlatformCALayer subclasses
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (174670 => 174671)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-10-14 04:43:53 UTC (rev 174670)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-10-14 06:58:15 UTC (rev 174671)
@@ -15,13 +15,6 @@
set(WebKit2_USE_PREFIX_HEADER ON)
list(APPEND WebKit2_SOURCES
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
- ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
-
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
-
NetworkProcess/gtk/NetworkProcessMainGtk.cpp
NetworkProcess/soup/NetworkProcessSoup.cpp
@@ -315,6 +308,15 @@
WebProcess/soup/WebProcessSoup.cpp
)
+list(APPEND WebKit2_DERIVED_SOURCES
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2InspectorGResourceBundle.c
+ ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKit2ResourcesGResourceBundle.c
+
+ ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
+ ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
+)
+
set(WebKit2GTK_INSTALLED_HEADERS
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
