From 229bf815e03f5fdec47baf240f12e5c4f89336f9 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 25 Feb 2020 20:40:22 +0000 Subject: [PATCH] Revert f1abbc5f, vcpkg upgrade is fixed. vcpkg upgrade is fixed via: https://github.com/microsoft/vcpkg/commit/f6d52648ecdd5d57a9ca592e1425950d465aeef5 Use upgrade --no-dry-run again to install the first package to upgrade. Signed-off-by: Rafael Kitover --- cmake/Set-Toolchain-vcpkg.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cmake/Set-Toolchain-vcpkg.cmake b/cmake/Set-Toolchain-vcpkg.cmake index 48c8e026..2e257175 100644 --- a/cmake/Set-Toolchain-vcpkg.cmake +++ b/cmake/Set-Toolchain-vcpkg.cmake @@ -159,12 +159,7 @@ function(vcpkg_set_toolchain) if(DEFINED first_upgrade) execute_process( - COMMAND ${vcpkg_exe} remove ${first_upgrade} - WORKING_DIRECTORY ${VCPKG_ROOT} - ) - - execute_process( - COMMAND ${vcpkg_exe} install ${first_upgrade} + COMMAND ${vcpkg_exe} upgrade --no-dry-run ${first_upgrade} WORKING_DIRECTORY ${VCPKG_ROOT} ) endif()