From 1a90255ab75002325e6a623c92edb732d2e05704 Mon Sep 17 00:00:00 2001
From: mwilsnd <53413200+mwilsnd@users.noreply.github.com>
Date: Wed, 2 Aug 2023 11:45:32 -0400
Subject: [PATCH] Update vcpkg to e65af7b (#1433)

---
 bin/CMakeLists.txt             | 6 +++---
 platform/glfw/CMakeLists.txt   | 2 +-
 platform/windows/vendor/vcpkg  | 2 +-
 platform/windows/windows.cmake | 7 +++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index bda272e45..c8d527417 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -36,15 +36,15 @@ if(WIN32)
     find_package(libuv REQUIRED)
 
     target_link_libraries(
-        mbgl-cache PRIVATE uv_a
+        mbgl-cache PRIVATE $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
     )
 
     target_link_libraries(
-        mbgl-offline PRIVATE uv_a
+        mbgl-offline PRIVATE $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
     )
 
     target_link_libraries(
-        mbgl-render PRIVATE uv_a
+        mbgl-render PRIVATE $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
     )
 endif()
 
diff --git a/platform/glfw/CMakeLists.txt b/platform/glfw/CMakeLists.txt
index bbfb88afe..2118a9fd2 100644
--- a/platform/glfw/CMakeLists.txt
+++ b/platform/glfw/CMakeLists.txt
@@ -73,7 +73,7 @@ if(WIN32)
         mbgl-glfw
         PRIVATE
             glfw
-            uv_a
+            $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
     )
 else()
     target_link_libraries(
diff --git a/platform/windows/vendor/vcpkg b/platform/windows/vendor/vcpkg
index a50b802d6..e65af7bb5 160000
--- a/platform/windows/vendor/vcpkg
+++ b/platform/windows/vendor/vcpkg
@@ -1 +1 @@
-Subproject commit a50b802d6b6598f191e7fcd03ce54b674b520e6e
+Subproject commit e65af7bb5cacc54bde298bc88516ca81f9ef09a3
diff --git a/platform/windows/windows.cmake b/platform/windows/windows.cmake
index f9b2591e2..bcc1b8d86 100644
--- a/platform/windows/windows.cmake
+++ b/platform/windows/windows.cmake
@@ -229,7 +229,7 @@ target_link_libraries(
         mbgl-compiler-options
         mbgl-benchmark
         -WHOLEARCHIVE:mbgl-benchmark
-        uv_a
+        $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
         shlwapi
 )
 
@@ -245,7 +245,10 @@ target_compile_definitions(
 
 target_link_libraries(
     mbgl-render-test-runner
-    PRIVATE mbgl-compiler-options mbgl-render-test uv_a
+    PRIVATE
+        mbgl-compiler-options
+        mbgl-render-test
+        $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>
 )
 
 # Disable benchmarks in CI as they run in VM environment