[CMake] Fix ANGLE for Mac CMake build#62560
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Apr 13, 2026
Merged
Conversation
Collaborator
|
EWS run on previous version of this PR (hash 51cd91b) Details
|
webkit-ews-buildbot
added
the
merging-blocked
pascoej
removed
the
merging-blocked
pascoej
force-pushed
the
eng/cmake-mac-angle
branch
from
51cd91b to
6473508
Compare
Collaborator
|
EWS run on previous version of this PR (hash 6473508) Details
|
🧪 wpe-wk2
burg
approved these changes
Apr 13, 2026
| @@ -44,15 +44,15 @@ if (ENABLE_WEBGL) | |||
| WEBKIT_COPY_FILES(ANGLEWebGLHeaders | |||
| DESTINATION ${ANGLE_FRAMEWORK_HEADERS_DIR}/ANGLE | |||
| FILES ${ANGLE_WEBGL_HEADERS} | |||
| FLATTENED | |||
| FLATTENED NO_SYMLINK # adjust-angle-include-paths.py rewrites these in-place | |||
pascoej
force-pushed
the
eng/cmake-mac-angle
branch
from
6473508 to
387d128
Compare
Collaborator
|
EWS run on current version of this PR (hash 387d128) Details
|
webkit-commit-queue
force-pushed
the
eng/cmake-mac-angle
branch
from
387d128 to
4cc4a5b
Compare
https://bugs.webkit.org/show_bug.cgi?id=312022 rdar://problem/174562352 Reviewed by BJ Burg. Set is_apple flag, update MSL source variable name, and add NO_SYMLINK to header copy targets for CMake Mac builds. Based on a base patch by Simon Lewis. * Source/ThirdParty/ANGLE/CMakeLists.txt: Add is_apple flag inside if (APPLE) block so ANGLE's GN-derived cmake finds Apple sources. * Source/ThirdParty/ANGLE/PlatformMac.cmake: Rename angle_translator_lib_metal_sources to angle_translator_lib_msl_sources to match upstream ANGLE variable rename. * Source/ThirdParty/ANGLE/include/CMakeLists.txt: Add NO_SYMLINK to ANGLEWebGLHeaders and GLSLANGHeaders so adjust-angle-include-paths.py does not rewrite source tree files. Canonical link: https://commits.webkit.org/311107@main
webkit-commit-queue
force-pushed
the
eng/cmake-mac-angle
branch
from
4cc4a5b to
9b5e74e
Compare
Collaborator
|
Committed 311107@main (9b5e74e): https://commits.webkit.org/311107@main Reviewed commits have been landed. Closing PR #62560 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
9b5e74e
387d128
🛠 win🧪 win-tests🧪 ios-wk2-wpt🧪 api-mac-debug