Diff
Modified: trunk/ChangeLog (275110 => 275111)
--- trunk/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,34 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR. There are still some
+ uses in GTK/WPE but those should be phased out.
+
+ Sets the directory structure to look like an Apple build in terms of where headers and
+ derived sources are held. Rather than having one root derived sources and one root
+ header directory those directories are now per project. This helps catch any errors with
+ header includes.
+
+ Deletes some old Mac CMake code that is no longer relevant around creating forwarding
+ headers.
+
+ For AppleWin the old structure is used because of its internal build which assumes the
+ old structure.
+
+ * Source/cmake/OptionsAppleWin.cmake:
+ * Source/cmake/OptionsFTW.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/OptionsWinCairo.cmake:
+ * Source/cmake/WebKitCommon.cmake:
+ * Source/cmake/WebKitFS.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+
2021-03-23 Adrian Perez de Castro <[email protected]>
[CMake] Use an imported target for the LCMS2 library
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (275110 => 275111)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1257,7 +1257,6 @@
VERBATIM)
# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
file(MAKE_DIRECTORY ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector)
add_custom_command(
OUTPUT ${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.cpp
Modified: trunk/Source/_javascript_Core/ChangeLog (275110 => 275111)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,15 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2021-03-26 Yusuke Suzuki <[email protected]>
[JSC] Use new Apple ICU APIs to avoid C++ ICU API usage
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (275110 => 275111)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -10,7 +10,6 @@
)
list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES
- ${DERIVED_SOURCES_DIR}
${_javascript_CORE_DIR}/disassembler/udis86
${_javascript_CORE_DIR}/inspector/cocoa
${_javascript_CORE_DIR}/inspector/remote/cocoa
Modified: trunk/Source/WebCore/ChangeLog (275110 => 275111)
--- trunk/Source/WebCore/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebCore/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,15 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR.
+
+ * PlatformFTW.cmake:
+ * PlatformWin.cmake:
+
2021-03-26 Tim Nguyen <[email protected]>
Make the object-position CSS property animatable.
Modified: trunk/Source/WebCore/PlatformFTW.cmake (275110 => 275111)
--- trunk/Source/WebCore/PlatformFTW.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebCore/PlatformFTW.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -19,10 +19,6 @@
"${WEBCORE_DIR}/platform/win"
)
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
-)
-
list(APPEND WebCore_SOURCES
accessibility/win/AXObjectCacheWin.cpp
accessibility/win/AccessibilityObjectWin.cpp
Modified: trunk/Source/WebCore/PlatformWin.cmake (275110 => 275111)
--- trunk/Source/WebCore/PlatformWin.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebCore/PlatformWin.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -14,10 +14,6 @@
"${WEBCORE_DIR}/platform/win"
)
-list(APPEND WebCore_INCLUDE_DIRECTORIES
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
-)
-
list(APPEND WebCore_SOURCES
accessibility/win/AXObjectCacheWin.cpp
accessibility/win/AccessibilityObjectWin.cpp
Modified: trunk/Source/WebKit/ChangeLog (275110 => 275111)
--- trunk/Source/WebKit/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebKit/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,15 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR.
+
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake: Remove creation of forwarding headers.
+
2021-03-26 Per Arne <[email protected]>
Enforce notifyd message filtering
Modified: trunk/Source/WebKit/PlatformGTK.cmake (275110 => 275111)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -620,10 +620,8 @@
target_link_libraries(webkit2gtkinjectedbundle WebKit)
target_include_directories(webkit2gtkinjectedbundle PRIVATE
- ${WebKit_INCLUDE_DIRECTORIES}
- ${WebKit_PRIVATE_INCLUDE_DIRECTORIES}
+ $<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>
"${DERIVED_SOURCES_DIR}/InjectedBundle"
- "${FORWARDING_HEADERS_DIR}"
"${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
"${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}"
"${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
@@ -699,13 +697,12 @@
-DWEBKIT2_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
-I${WEBKIT_DIR}
- -I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
-I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
- -I${FORWARDING_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
+ -I${_javascript_Core_FRAMEWORK_HEADERS_DIR}
${WebKit2GTK_INSTALLED_HEADERS}
${WEBKIT_DIR}/Shared/API/glib/*.cpp
${WEBKIT_DIR}/UIProcess/API/glib/*.cpp
@@ -747,14 +744,13 @@
-DWEBKIT2_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
-I${WEBKIT_DIR}
- -I${DERIVED_SOURCES_DIR}
-I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
-I${DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR}
- -I${FORWARDING_HEADERS_DIR}
-I${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
-I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
-I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
+ -I${_javascript_Core_FRAMEWORK_HEADERS_DIR}
-I${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk
${WebKitDOM_INSTALLED_HEADERS}
${WebKit2WebExtension_INSTALLED_HEADERS}
Modified: trunk/Source/WebKit/PlatformMac.cmake (275110 => 275111)
--- trunk/Source/WebKit/PlatformMac.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebKit/PlatformMac.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -108,7 +108,6 @@
"${WEBKIT_DIR}/WebProcess/WebPage/mac"
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
"${WEBKITLEGACY_DIR}"
- "${FORWARDING_HEADERS_DIR}/WebCore"
)
set(XPCService_SOURCES
@@ -229,24 +228,6 @@
WebProcess/InjectedBundle/API/mac
)
-WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit_FORWARDING_HEADERS_DIRECTORIES})
-
-# This is needed right now to import ObjC headers instead of including them.
-# FIXME: Forwarding headers should be copies of actual headers.
-file(GLOB ObjCHeaders UIProcess/API/Cocoa/*.h)
-foreach (_file ${ObjCHeaders})
- get_filename_component(_name ${_file} NAME)
- if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/${_name})
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit/UIProcess/API/Cocoa/${_name}>")
- endif ()
-endforeach ()
-if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h)
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h "#import <WebKit/UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h>")
-endif ()
-if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h)
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h "#import <WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h>")
-endif ()
-
# FIXME: Forwarding headers should be complete copies of the header.
set(WebKitLegacyForwardingHeaders
DOM.h
@@ -305,9 +286,6 @@
WebViewPrivate
WebViewPrivate.h
)
-foreach (_file ${WebKitLegacyForwardingHeaders})
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
-endforeach ()
set(ObjCForwardingHeaders
DOMAbstractView.h
@@ -449,13 +427,7 @@
DOMXPathNSResolver.h
DOMXPathResult.h
)
-foreach (_file ${ObjCForwardingHeaders})
- file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
-endforeach ()
-# FIXME: These should not be necessary.
-file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
-
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
target_link_options(WebKit PRIVATE -weak_framework SafariSafeBrowsing -lsandbox -framework AuthKit)
Modified: trunk/Source/WebKitLegacy/ChangeLog (275110 => 275111)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,14 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR.
+
+ * PlatformMac.cmake:
+
2021-03-19 Per Arne <[email protected]>
[Win] Fix build issue
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (275110 => 275111)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -7,9 +7,6 @@
list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
"${WEBKITLEGACY_DIR}"
"${WEBKITLEGACY_DIR}/mac"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
)
list(APPEND WebKitLegacy_UNIFIED_SOURCE_LIST_FILES
Modified: trunk/Source/cmake/OptionsAppleWin.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsAppleWin.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsAppleWin.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -97,6 +97,33 @@
# Warnings as errors (ignore narrowing conversions)
add_compile_options(/WX /Wv:18)
+# Support AppleWin internal build by using deprecated directory structure
+set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
+set(WTF_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
+set(_javascript_Core_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
+set(PAL_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/PAL")
+set(WebCore_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
+set(WebDriver_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver")
+set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
+set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
+set(TestRunnerShared_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/TestRunnerShared")
+set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree")
+set(WebKitTestRunner_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitTestRunner")
+
+set(FORWARDING_HEADERS_DIR "${DERIVED_SOURCES_DIR}/ForwardingHeaders")
+set(bmalloc_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(ANGLE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(_javascript_Core_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(PAL_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
+
if (INTERNAL_BUILD)
set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/_javascript_Core/Scripts")
Modified: trunk/Source/cmake/OptionsFTW.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsFTW.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsFTW.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -239,25 +239,3 @@
set(ENABLE_WEBCORE ON)
set(ENABLE_WEBKIT ON)
set(ENABLE_WEBKIT_LEGACY ON)
-
-# Override headers directories
-set(ANGLE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/ANGLE/Headers)
-set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/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(PAL_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/PAL/Headers)
-set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders)
-set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/Headers)
-set(WebKit_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/Headers)
-set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders)
-
-# Override derived sources directories
-set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources)
-set(_javascript_Core_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/DerivedSources)
-set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
-set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
-set(WebKit_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKit/DerivedSources)
-
-# Override scripts directories
-set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
-set(_javascript_Core_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/Scripts)
Modified: trunk/Source/cmake/OptionsGTK.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsGTK.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsGTK.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -472,15 +472,26 @@
set(ENABLE_GTKDOC OFF)
endif ()
+# Using DERIVED_SOURCES_DIR is deprecated
+set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
set(DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_coregtk)
+set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
+
+# Using FORWARDING_HEADERS_DIR is deprecated
+set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
set(FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
+# FIXME: Remove in https://bugs.webkit.org/show_bug.cgi?id=210891
+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(_javascript_Core_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -163,28 +163,6 @@
SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL ON)
SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE ON)
-# Override headers directories
-set(ANGLE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/ANGLE/Headers)
-set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/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(PAL_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/PAL/Headers)
-set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders)
-set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/Headers)
-set(WebKit_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/Headers)
-set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders)
-
-# Override derived sources directories
-set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources)
-set(_javascript_Core_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/DerivedSources)
-set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
-set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
-set(WebKit_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKit/DerivedSources)
-
-# Override scripts directories
-set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
-set(_javascript_Core_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/Scripts)
-
# Create a shared _javascript_Core with WTF and bmalloc exposed through it.
#
# Use OBJECT libraries for bmalloc and WTF. This is the modern CMake way to emulate
Modified: trunk/Source/cmake/OptionsWPE.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsWPE.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsWPE.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -276,14 +276,24 @@
set(ENABLE_GTKDOC OFF)
endif ()
+# Using DERIVED_SOURCES_DIR is deprecated
+set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
+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")
+
+# Using FORWARDING_HEADERS_DIR is deprecated
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
set(FORWARDING_HEADERS_WPE_DIR ${FORWARDING_HEADERS_DIR}/wpe)
set(FORWARDING_HEADERS_WPE_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/wpe-webextension)
set(FORWARDING_HEADERS_WPE_DOM_DIR ${FORWARDING_HEADERS_DIR}/wpe-dom)
set(FORWARDING_HEADERS_WPE_JSC_DIR ${FORWARDING_HEADERS_DIR}/wpe-jsc)
-set(DERIVED_SOURCES_JAVASCRIPTCORE_GLIB_DIR ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/_javascript_corewpe)
-set(DERIVED_SOURCES_WPE_API_DIR ${DERIVED_SOURCES_WEBKIT_DIR}/wpe)
+# FIXME: Remove in https://bugs.webkit.org/show_bug.cgi?id=210891
+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(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/Source/cmake/OptionsWinCairo.cmake (275110 => 275111)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -68,29 +68,6 @@
add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
add_definitions(-DNOCRYPT)
-# Override headers directories
-set(ANGLE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/ANGLE/Headers)
-set(WTF_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WTF/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(PAL_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/PAL/Headers)
-set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders)
-set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/Headers)
-set(WebKit_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/Headers)
-set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders)
-
-# Override derived sources directories
-set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources)
-set(_javascript_Core_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/DerivedSources)
-set(WebCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebCore/DerivedSources)
-set(WebKitLegacy_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources)
-set(WebKit_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WebKit/DerivedSources)
-set(TestRunnerShared_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/TestRunnerShared/DerivedSources)
-
-# Override scripts directories
-set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts)
-set(_javascript_Core_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/_javascript_Core/Scripts)
-
# Override library types
set(WebCore_LIBRARY_TYPE OBJECT)
set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)
Modified: trunk/Source/cmake/WebKitCommon.cmake (275110 => 275111)
--- trunk/Source/cmake/WebKitCommon.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/WebKitCommon.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -232,20 +232,24 @@
# Create derived sources directories
# -----------------------------------------------------------------------------
+ file(MAKE_DIRECTORY ${WTF_DERIVED_SOURCES_DIR})
+ file(MAKE_DIRECTORY ${_javascript_Core_DERIVED_SOURCES_DIR})
+
if (ENABLE_WEBCORE)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
+ file(MAKE_DIRECTORY ${PAL_DERIVED_SOURCES_DIR})
+ file(MAKE_DIRECTORY ${WebCore_DERIVED_SOURCES_DIR})
endif ()
if (ENABLE_WEBKIT)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
+ file(MAKE_DIRECTORY ${WebKit_DERIVED_SOURCES_DIR})
endif ()
if (ENABLE_WEBKIT_LEGACY)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+ file(MAKE_DIRECTORY ${WebKitLegacy_DERIVED_SOURCES_DIR})
endif ()
if (ENABLE_WEBDRIVER)
- file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBDRIVER_DIR})
+ file(MAKE_DIRECTORY ${WebDriver_DERIVED_SOURCES_DIR})
endif ()
# -----------------------------------------------------------------------------
Modified: trunk/Source/cmake/WebKitFS.cmake (275110 => 275111)
--- trunk/Source/cmake/WebKitFS.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/WebKitFS.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -32,45 +32,29 @@
set(WEBINSPECTORUI_DIR "${CMAKE_SOURCE_DIR}/Source/WebInspectorUI")
endif ()
-set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
-set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
-set(DERIVED_SOURCES_PAL_DIR "${CMAKE_BINARY_DIR}/DerivedSources/PAL")
-set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBDRIVER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver")
-set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
-set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
-set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
+set(WTF_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WTF/DerivedSources")
+set(_javascript_Core_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/_javascript_Core/DerivedSources")
+set(PAL_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/PAL/DerivedSources")
+set(WebCore_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebCore/DerivedSources")
+set(WebDriver_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebDriver/DerivedSources")
+set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebKitLegacy/DerivedSources")
+set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebKit/DerivedSources")
+set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebInspectorUI/DerivedSources")
+set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/MiniBrowser/DerivedSources")
+set(TestRunnerShared_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/TestRunnerShared/DerivedSources")
+set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DumpRenderTree/DerivedSources")
+set(WebKitTestRunner_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/WebKitTestRunner/DerivedSources")
-# These values will replace the above after refactoring is complete
-set(WTF_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
-set(_javascript_Core_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/_javascript_Core")
-set(PAL_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/PAL")
-set(WebCore_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(WebDriver_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver")
-set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
-set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
-set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
-set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
-set(TestRunnerShared_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/TestRunnerShared")
-set(DumpRenderTree_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/DumpRenderTree")
-set(WebKitTestRunner_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitTestRunner")
+set(bmalloc_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/bmalloc/Headers")
+set(ANGLE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/ANGLE/Headers")
+set(WTF_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WTF/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(PAL_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/PAL/Headers")
+set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WebCore/PrivateHeaders")
+set(WebKitLegacy_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WebKitLegacy/Headers")
+set(WebKit_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WebKit/Headers")
+set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR "${CMAKE_BINARY_DIR}/WebKit/PrivateHeaders")
-set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
-
-set(bmalloc_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(ANGLE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(WTF_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(_javascript_Core_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(PAL_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(WebKitLegacy_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(WebKit_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR})
-
-set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
-set(_javascript_Core_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/_javascript_Core/Scripts")
-
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/Protocol)
-file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
+set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/WTF/Scripts")
+set(_javascript_Core_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/_javascript_Core/Scripts")
Modified: trunk/Source/cmake/WebKitMacros.cmake (275110 => 275111)
--- trunk/Source/cmake/WebKitMacros.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Source/cmake/WebKitMacros.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -400,41 +400,6 @@
endif ()
endmacro()
-macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
- # On Windows, we copy the entire contents of forwarding headers.
- if (NOT WIN32)
- set(_processing_directories 0)
- set(_processing_files 0)
- set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")
-
- file(GLOB _files "${_target_directory}/*.h")
- foreach (_file ${_files})
- file(READ "${_file}" _content)
- string(REGEX MATCH "^#include \"([^\"]*)\"" _matched ${_content})
- if (_matched AND NOT EXISTS "${CMAKE_SOURCE_DIR}/Source/${CMAKE_MATCH_1}")
- file(REMOVE "${_file}")
- endif ()
- endforeach ()
-
- foreach (_currentArg ${ARGN})
- if ("${_currentArg}" STREQUAL "DIRECTORIES")
- set(_processing_directories 1)
- set(_processing_files 0)
- elseif ("${_currentArg}" STREQUAL "FILES")
- set(_processing_directories 0)
- set(_processing_files 1)
- elseif (_processing_directories)
- file(GLOB _files "${_currentArg}/*.h")
- foreach (_file ${_files})
- WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_file})
- endforeach ()
- elseif (_processing_files)
- WEBKIT_CREATE_FORWARDING_HEADER(${_target_directory} ${_currentArg})
- endif ()
- endforeach ()
- endif ()
-endmacro()
-
function(WEBKIT_MAKE_FORWARDING_HEADERS framework)
set(options FLATTENED)
set(oneValueArgs DESTINATION TARGET_NAME)
Modified: trunk/Tools/ChangeLog (275110 => 275111)
--- trunk/Tools/ChangeLog 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/ChangeLog 2021-03-26 20:37:09 UTC (rev 275111)
@@ -1,3 +1,18 @@
+2021-03-26 Don Olmstead <[email protected]>
+
+ [CMake] Deprecate using DERIVED_SOURCES_DIR/FOWARDING_HEADERS_DIR directly
+ https://bugs.webkit.org/show_bug.cgi?id=223763
+
+ Reviewed by Michael Catanzaro.
+
+ Remove any usages of DERIVED_SOURCES_DIR and FOWARDING_HEADERS_DIR.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * MiniBrowser/mac/CMakeLists.txt:
+ * WebKitTestRunner/PlatformMac.cmake:
+ * wpe/backends/CMakeLists.txt:
+
2021-03-26 Zalan Bujtas <[email protected]>
[MiniBrowser] Remove redundant "Disable Simple Line Layout" menu item
Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (275110 => 275111)
--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -29,10 +29,6 @@
${DumpRenderTree_DIR}/mac
${DumpRenderTree_DIR}/mac/InternalHeaders/WebKit
${DumpRenderTree_DIR}/TestNetscapePlugIn
- ${FORWARDING_HEADERS_DIR}
- ${FORWARDING_HEADERS_DIR}/WebCore
- ${FORWARDING_HEADERS_DIR}/WebKit
- ${FORWARDING_HEADERS_DIR}/WebKitLegacy
${WEBCORE_DIR}/testing/cocoa
${WEBKITLEGACY_DIR}
${WebKitTestRunner_SHARED_DIR}/cocoa
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (275110 => 275111)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2021-03-26 20:37:09 UTC (rev 275111)
@@ -25,7 +25,6 @@
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_VERSIONED_DIR}
- ${FORWARDING_HEADERS_DIR}
${CMAKE_SOURCE_DIR}/Source
)
Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (275110 => 275111)
--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt 2021-03-26 20:37:09 UTC (rev 275111)
@@ -17,8 +17,6 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Source/WebKitLegacy
${CMAKE_SOURCE_DIR}/Source
- ${FORWARDING_HEADERS_DIR}
- ${FORWARDING_HEADERS_DIR}/WebKit
${MINIBROWSER_DIR}
)
Modified: trunk/Tools/WebKitTestRunner/PlatformMac.cmake (275110 => 275111)
--- trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/WebKitTestRunner/PlatformMac.cmake 2021-03-26 20:37:09 UTC (rev 275111)
@@ -17,12 +17,6 @@
list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/WebKitLibraries
- ${DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_DIR}/WebCore
- ${FORWARDING_HEADERS_DIR}
- ${FORWARDING_HEADERS_DIR}/_javascript_Core
- ${FORWARDING_HEADERS_DIR}/WebCore
- ${FORWARDING_HEADERS_DIR}/WebKit
${ICU_INCLUDE_DIRS}
${WEBCORE_DIR}/testing/cocoa
${WEBKITLEGACY_DIR}
Modified: trunk/Tools/wpe/backends/CMakeLists.txt (275110 => 275111)
--- trunk/Tools/wpe/backends/CMakeLists.txt 2021-03-26 20:07:12 UTC (rev 275110)
+++ trunk/Tools/wpe/backends/CMakeLists.txt 2021-03-26 20:37:09 UTC (rev 275111)
@@ -3,8 +3,6 @@
find_package(WaylandProtocols 1.12 REQUIRED)
find_package(WPEBackend_fdo 1.3.0 REQUIRED)
-set(DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WPEToolingBackends")
-
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WPETOOLINGBACKENDS_DIR})
set(WPEToolingBackends_SOURCES
