Update vcpkg to e65af7b (#1433)
This commit is contained in:
@@ -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()
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
2
platform/windows/vendor/vcpkg
vendored
2
platform/windows/vendor/vcpkg
vendored
Submodule platform/windows/vendor/vcpkg updated: a50b802d6b...e65af7bb5c
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user