Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[angle] Avoid link to frameworks with absolute path on macOS #32890

Merged
merged 2 commits into from
Aug 2, 2023
Merged

[angle] Avoid link to frameworks with absolute path on macOS #32890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63383d4
[angle] Avoid link to frameworks with absolute path on macOS
xiaozhuai Aug 2, 2023
65e2b93
update version database
xiaozhuai Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions ports/angle/cmake-buildsystem/PlatformMac.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
find_library(COREGRAPHICS_LIBRARY CoreGraphics)
find_library(FOUNDATION_LIBRARY Foundation)
find_library(IOKIT_LIBRARY IOKit)
find_library(IOSURFACE_LIBRARY IOSurface)
find_library(QUARTZ_LIBRARY Quartz)
find_package(ZLIB REQUIRED)

list(APPEND ANGLE_SOURCES
Expand All @@ -12,16 +7,15 @@ list(APPEND ANGLE_SOURCES
)

list(APPEND ANGLEGLESv2_LIBRARIES
${COREGRAPHICS_LIBRARY}
${FOUNDATION_LIBRARY}
${IOKIT_LIBRARY}
${IOSURFACE_LIBRARY}
${QUARTZ_LIBRARY}
"-framework CoreGraphics"
"-framework Foundation"
"-framework IOKit"
"-framework IOSurface"
"-framework Quartz"
)

# Metal backend
if(USE_METAL)
find_library(METAL_LIBRARY Metal)
list(APPEND ANGLE_SOURCES
${_metal_backend_sources}

Expand All @@ -35,7 +29,7 @@ if(USE_METAL)
)

list(APPEND ANGLEGLESv2_LIBRARIES
${METAL_LIBRARY}
"-framework Metal"
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/angle/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angle",
"version-string": "chromium_5414",
"port-version": 6,
"port-version": 7,
"description": [
"A conformant OpenGL ES implementation for Windows, Mac and Linux.",
"The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/angle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5502570ef18abdcf0535470f3ea6589db70607b",
"version-string": "chromium_5414",
"port-version": 7
},
{
"git-tree": "28f33feb91072e2df5daa5b7e10846db4a6f3a50",
"version-string": "chromium_5414",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
},
"angle": {
"baseline": "chromium_5414",
"port-version": 6
"port-version": 7
},
"annoy": {
"baseline": "1.17.2",
Expand Down