Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 13c2abad31e3ae48cbd682e68756a491b2dc028d
https://github.com/WebKit/WebKit/commit/13c2abad31e3ae48cbd682e68756a491b2dc028d
Author: Elliott Williams <[email protected]>
Date: 2026-06-10 (Wed, 10 Jun 2026)
Changed paths:
M Source/CMakeLists.txt
M Source/JavaScriptCore/CMakeLists.txt
M Source/WTF/wtf/CMakeLists.txt
M Source/WebCore/CMakeLists.txt
M Source/WebCore/PAL/pal/CMakeLists.txt
M Source/WebCore/PlatformIOS.cmake
M Source/WebGPU/WebGPU/CMakeLists.txt
M Source/WebKit/CMakeLists.txt
M Source/WebKit/PlatformIOS.cmake
M Source/WebKitLegacy/CMakeLists.txt
M Source/bmalloc/CMakeLists.txt
M Source/cmake/OptionsCocoa.cmake
M Source/cmake/OptionsIOS.cmake
Log Message:
-----------
[CMake] Integrate WebKitAdditions as a CMake target
https://bugs.webkit.org/show_bug.cgi?id=316560
rdar://178915750
Reviewed by Geoffrey Garen.
Integrate WebKitAdditions as an interface library, instead of ad-hoc
copying and managing the include path. Use WebKitAdditions whenever an
internal SDK is active.
This makes it easier to ensure that WKA is available during all
compilation (it becomes transitively added to the search path, for all
targets with linkage downstream of JavaScriptCore).
It also supports adding build-time logic to WebKitAdditions, such as
running scripts (which we currently do in Xcode), and having it fit
correctly into the dependency graph.
* Source/CMakeLists.txt: Include WKA as a subproject.
All these changes are adding WebKitAdditions to each target's
*_FRAMEWORKS list. In some targets, the WebKitAdditions directory itself
is added to the headers search path. This supports existing source code
that includes WKA content via quote-stye includes.
Also: WKA is always included as project headers (-I), not system headers
(-isystem). We control WKA content, so it's important to parse it in the
same diagnostic modes.
* Source/JavaScriptCore/CMakeLists.txt:
* Source/WTF/wtf/CMakeLists.txt:
* Source/WebCore/CMakeLists.txt:
* Source/WebCore/PAL/pal/CMakeLists.txt: In addition to linkage changes,
upstream logic from WebKitAdditions for deciding which touch event
implementation to use.
* Source/WebCore/PlatformIOS.cmake: Remove the logic that includes CMake
code from WebKitAdditions in favor of configuring the build
statically. This removes the need for WKA to be present at configure
time -- it's all based on active SDK.
* Source/WebGPU/WebGPU/CMakeLists.txt:
* Source/WebKit/CMakeLists.txt:
* Source/WebKit/PlatformIOS.cmake:
* Source/WebKitLegacy/CMakeLists.txt:
* Source/bmalloc/CMakeLists.txt:
In the shared CMake library, remove logic for ad-hoc lookup of "staged"
WKA headers.
* Source/cmake/OptionsCocoa.cmake:
* Source/cmake/OptionsIOS.cmake:
Canonical link: https://commits.webkit.org/314945@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
