Title: [174645] releases/WebKitGTK/webkit-2.6
- Revision
- 174645
- Author
- [email protected]
- Date
- 2014-10-13 04:56:34 -0700 (Mon, 13 Oct 2014)
Log Message
Unreviewed. Fix make distcheck.
Source/WebKit2:
* CMakeLists.txt:
* PlatformGTK.cmake:
Tools:
* TestWebKitAPI/PlatformGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/CMakeLists.txt (174644 => 174645)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/CMakeLists.txt 2014-10-13 09:19:44 UTC (rev 174644)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/CMakeLists.txt 2014-10-13 11:56:34 UTC (rev 174645)
@@ -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: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174644 => 174645)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-13 09:19:44 UTC (rev 174644)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-13 11:56:34 UTC (rev 174645)
@@ -1,3 +1,10 @@
+2014-10-13 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+
2014-10-12 Sergio Villar Senin <[email protected]>
[SOUP] [WK2] WebProcess and NetworkProcess initialization clears cache contents
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake (174644 => 174645)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-10-13 09:19:44 UTC (rev 174644)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-10-13 11:56:34 UTC (rev 174645)
@@ -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
Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (174644 => 174645)
--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-13 09:19:44 UTC (rev 174644)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-13 11:56:34 UTC (rev 174645)
@@ -1,3 +1,9 @@
+2014-10-13 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix make distcheck.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+
2014-10-11 Carlos Garcia Campos <[email protected]>
[GLIB] Split GMainLoopSource moving thread safe implementation to its own class GThreadSafeMainLoopSource
Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformGTK.cmake (174644 => 174645)
--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-10-13 09:19:44 UTC (rev 174644)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-10-13 11:56:34 UTC (rev 174645)
@@ -124,6 +124,8 @@
)
target_link_libraries(TestWebCore ${test_webcore_LIBRARIES})
+add_dependencies(TestWebCore ${ForwardingHeadersForTestWebKitAPI_NAME})
+
add_test(TestWebCore ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore/TestWebCore)
set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
