Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 36245ab31b3dac68cd55ae11892dd29c9fa19794
https://github.com/WebKit/WebKit/commit/36245ab31b3dac68cd55ae11892dd29c9fa19794
Author: Simon Fraser <[email protected]>
Date: 2026-09-22 (Tue, 22 Sep 2026)
Changed paths:
M Source/WebKit/PlatformCocoa.cmake
Log Message:
-----------
cmake build broken after 321561@main
https://bugs.webkit.org/show_bug.cgi?id=324836
rdar://188110355
Reviewed by Zak Ridouh.
321561@main pointed the WebKit framework header map at the copies of the headers
which have had their WebKitAdditions fragments spliced in, so that consumers
stop
reading the unprocessed headers out of the source tree. That header map is also
on
WebKit's own compile lines, where it takes precedence over
WebKit-project-headers,
so WebKit's sources started seeing the processed copies too. The Xcode build
points
them at the source tree instead, and the WebKitAdditions .mm files rely on that:
they declare a category of their own and import the same fragment into it, so a
translation unit which also sees the spliced copy ends up with duplicate
declarations, and with properties whose only implementation is in another
category.
Generate a second header map covering just the headers which import
WebKitAdditions
fragments, mapping them back to the source tree, and add it to this directory's
include directories so WebKit's own targets keep seeing the unprocessed
headers. It
is not exported, so consumers continue to resolve <WebKit/WKWebViewPrivate.h>
to the
processed copy. include_directories(BEFORE) prepends, so the call is deferred
to the
end of the directory in order to be searched ahead of WebKit-framework-headers.
* Source/WebKit/PlatformCocoa.cmake:
Canonical link: https://commits.webkit.org/321630@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
