diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index febe509510013e..257e1eaee8e4b4 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -742,7 +742,8 @@ else() ) endif() -install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle) +install(EXPORT ANGLEExport FILE unofficial-angle-targets.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle) +install(FILES unofficial-angle-config.cmake DESTINATION share/unofficial-angle) if(NOT DISABLE_INSTALL_HEADERS) install( diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index df39e019738cc1..885e8b44545fc1 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_from_github( ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-angle-config.cmake" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}/src/common") diff --git a/ports/angle/unofficial-angle-config.cmake b/ports/angle/unofficial-angle-config.cmake new file mode 100644 index 00000000000000..79abf89d7849a0 --- /dev/null +++ b/ports/angle/unofficial-angle-config.cmake @@ -0,0 +1,7 @@ +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +if(UNIX AND NOT APPLE) + find_dependency(X11 COMPONENTS Xext Xi) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-angle-targets.cmake") diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 144b4956ceb5d1..83ace497b85731 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,12 +1,13 @@ { "name": "angle", "version-string": "chromium_4472", - "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." ], "homepage": "https://github.com/google/angle", + "license": "BSD-3-Clause", "dependencies": [ "egl-registry", { diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 5977dc6ce0a23a..a3410e77809fc0 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10d893d25d50a449f8aa0592007b973516f325a7", + "version-string": "chromium_4472", + "port-version": 7 + }, { "git-tree": "d48bbcf1eba07a4156e745140be81caff95b8757", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index e8bd6db9b3f7be..5c423adacfabee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -106,7 +106,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 6 + "port-version": 7 }, "antlr4": { "baseline": "4.11.1",