Title: [275127] trunk
- Revision
- 275127
- Author
- [email protected]
- Date
- 2021-03-26 20:09:33 -0700 (Fri, 26 Mar 2021)
Log Message
REGRESSION(r275111) [GLIB] Fix build with new derived sources and forwarding headers scheme
https://bugs.webkit.org/show_bug.cgi?id=223834
Unreviewed build fix.
.:
Buildfix for now. Actual removal of older scheme will come in the
future.
* Source/cmake/OptionsWPE.cmake: Add some missing variables with the
per framework source and header dirs.
Tools:
* TestWebKitAPI/glib/CMakeLists.txt: Add some missing variables with
needed include headers.
Modified Paths
Diff
Modified: trunk/ChangeLog (275126 => 275127)
--- trunk/ChangeLog 2021-03-27 01:37:26 UTC (rev 275126)
+++ trunk/ChangeLog 2021-03-27 03:09:33 UTC (rev 275127)
@@ -1,3 +1,16 @@
+2021-03-26 Lauro Moura <[email protected]>
+
+ REGRESSION(r275111) [GLIB] Fix build with new derived sources and forwarding headers scheme
+ https://bugs.webkit.org/show_bug.cgi?id=223834
+
+ Unreviewed build fix.
+
+ Buildfix for now. Actual removal of older scheme will come in the
+ future.
+
+ * Source/cmake/OptionsWPE.cmake: Add some missing variables with the
+ per framework source and header dirs.
+
2021-03-26 Don Olmstead <[email protected]>
[CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
Modified: trunk/Source/cmake/OptionsWPE.cmake (275126 => 275127)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-03-27 01:37:26 UTC (rev 275126)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-03-27 03:09:33 UTC (rev 275127)
@@ -278,6 +278,7 @@
# Using DERIVED_SOURCES_DIR is deprecated
set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
+set(DERIVED_SOURCES_WEBKIT_DIR ${DERIVED_SOURCES_DIR}/WebKit)
set(DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_corewpe)
set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
@@ -293,6 +294,11 @@
set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
+set(PAL_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/PAL")
+set(PAL_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/PAL/Headers")
+set(_javascript_Core_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/_javascript_Core/Headers")
+set(_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/_javascript_Core/PrivateHeaders")
+set(WTF_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WTF/Headers")
set(WPE_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}.pc)
set(WPEWebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}.pc)
Modified: trunk/Tools/ChangeLog (275126 => 275127)
--- trunk/Tools/ChangeLog 2021-03-27 01:37:26 UTC (rev 275126)
+++ trunk/Tools/ChangeLog 2021-03-27 03:09:33 UTC (rev 275127)
@@ -1,3 +1,13 @@
+2021-03-26 Lauro Moura <[email protected]>
+
+ REGRESSION(r275111) [GLIB] Fix build with new derived sources and forwarding headers scheme
+ https://bugs.webkit.org/show_bug.cgi?id=223834
+
+ Unreviewed build fix.
+
+ * TestWebKitAPI/glib/CMakeLists.txt: Add some missing variables with
+ needed include headers.
+
2021-03-26 Tyler Wilcock <[email protected]>
Fix TypeError: Can't mix strings and bytes in path components in Tools/Scripts/dump-class-layout
Modified: trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt (275126 => 275127)
--- trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2021-03-27 01:37:26 UTC (rev 275126)
+++ trunk/Tools/TestWebKitAPI/glib/CMakeLists.txt 2021-03-27 03:09:33 UTC (rev 275127)
@@ -8,6 +8,11 @@
set(WebKitGLibAPITests_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${FORWARDING_HEADERS_DIR}
+ # FIXME Should we add a _PRIVATE_INCLUDE_DIRECTORIES for this?
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${PAL_FRAMEWORK_HEADERS_DIR}
${TOOLS_DIR}/TestWebKitAPI/Tests/WebKitGLib
${TOOLS_DIR}/TestWebKitAPI/glib/WebKitGLib
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
