Update vcpkg to e65af7b (#1433)

This commit is contained in:
mwilsnd
2023-08-02 11:45:32 -04:00
committed by GitHub
parent 1c44705685
commit 1a90255ab7
4 changed files with 10 additions and 7 deletions

View File

@@ -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()

View File

@@ -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(

View File

@@ -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