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.

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

Merge from microsoft-master #1836

Merged
merged 9 commits into from
Jan 1, 2025
Prev Previous commit
Next Next commit
[angle] Add export unofficial targets include (microsoft#43023)
WangWeiLin-MV authored Dec 31, 2024

Verified

This commit was signed with the committer’s verified signature.
Freyskeyd Simon Paitrault
commit fc75cfe2f86dcdd159ede8552ad0d78c2d60ae08
1 change: 1 addition & 0 deletions ports/angle/cmake-buildsystem/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -414,6 +414,7 @@ set(_possibleTargets EGL GLESv2 ANGLE)
foreach(_target IN LISTS _possibleTargets)
if(TARGET ${_target})
list(APPEND _installableTargets "${_target}")
target_include_directories(${_target} INTERFACE $<INSTALL_INTERFACE:include>)
endif()
endforeach()

2 changes: 1 addition & 1 deletion ports/angle/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angle",
"version-string": "chromium_5414",
"port-version": 9,
"port-version": 10,
"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."
5 changes: 5 additions & 0 deletions versions/a-/angle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "025eefba308651be2ae69502477d1201dfdf04ea",
"version-string": "chromium_5414",
"port-version": 10
},
{
"git-tree": "b0e6049d392ece97ba5be00c7c3e4410aa78d3f0",
"version-string": "chromium_5414",
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@
},
"angle": {
"baseline": "chromium_5414",
"port-version": 9
"port-version": 10
},
"ankurvdev-embedresource": {
"baseline": "0.0.11",