From db834cbaefb8f4e6a7d0c451e1979fc6d3ccbab7 Mon Sep 17 00:00:00 2001 From: Bot <98049902+meshinspector-bot@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:03:34 +0300 Subject: [PATCH] Bump vcpkg to 2024.10.21 (#3561) * Update vcpkg tag to 2024.10.21 * requirements/windows.txt += boost-url --------- Co-authored-by: Fedor Chelnokov --- .github/workflows/build-test-distribute.yml | 2 +- .github/workflows/build-test-windows.yml | 2 +- .github/workflows/pip-build.yml | 2 +- .github/workflows/prepare-images.yml | 2 +- doxygen/HomePage.dox | 2 +- readme.md | 2 +- requirements/windows.txt | 3 ++- thirdparty/install.bat | 4 ++-- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-test-distribute.yml b/.github/workflows/build-test-distribute.yml index 20960dff1519..37831aaabfed 100644 --- a/.github/workflows/build-test-distribute.yml +++ b/.github/workflows/build-test-distribute.yml @@ -18,7 +18,7 @@ on: env: - VCPKG-VERSION: '2024.07.12' + VCPKG-VERSION: '2024.10.21' jobs: prepare-image: diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index 91b5e53c89c2..08c86201b396 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -20,7 +20,7 @@ on: type: boolean env: - VCPKG-VERSION: '2024.07.12' + VCPKG-VERSION: '2024.10.21' jobs: windows-build-test: diff --git a/.github/workflows/pip-build.yml b/.github/workflows/pip-build.yml index d55520766a02..5ae27c5cad2f 100644 --- a/.github/workflows/pip-build.yml +++ b/.github/workflows/pip-build.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - VCPKG-VERSION: '2024.07.12' + VCPKG-VERSION: '2024.10.21' CUDA-VERSION: '11.4.2.47141' CUDA-MAJOR: '11' CUDA-MINOR: '4' diff --git a/.github/workflows/prepare-images.yml b/.github/workflows/prepare-images.yml index 9dbc3a9526ca..d15737b6d68e 100644 --- a/.github/workflows/prepare-images.yml +++ b/.github/workflows/prepare-images.yml @@ -14,7 +14,7 @@ on: workflow_dispatch: env: - VCPKG-VERSION: '2024.07.12' + VCPKG-VERSION: '2024.10.21' jobs: image-select: diff --git a/doxygen/HomePage.dox b/doxygen/HomePage.dox index 5d876c1b1e78..aa180b82aec4 100644 --- a/doxygen/HomePage.dox +++ b/doxygen/HomePage.dox @@ -29,7 +29,7 @@ Please install CUDA (v12.0|v11.4)(Visual Studio 2022|2019) from [official site]( \code $ git clone https://github.com/Microsoft/vcpkg.git $ cd vcpkg -$ git checkout 2024.07.12 +$ git checkout 2024.10.21 $ .\bootstrap-vcpkg.bat $ .\vcpkg integrate install (with admin rights) $ cd .. diff --git a/readme.md b/readme.md index 570d3ce44c9d..af3b6e4c6e12 100644 --- a/readme.md +++ b/readme.md @@ -201,7 +201,7 @@ If you would like to use another version of CUDA, please modify `MRCudaVersion` ```sh git clone https://github.com/Microsoft/vcpkg.git cd vcpkg - git checkout 2024.07.12 + git checkout 2024.10.21 .\bootstrap-vcpkg.bat .\vcpkg integrate install (with admin rights) ``` diff --git a/requirements/windows.txt b/requirements/windows.txt index 982898fd6782..de2bd502808c 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -9,6 +9,7 @@ boost-range boost-serialization boost-signals2 boost-stacktrace +boost-url libjpeg-turbo cpr eigen3 @@ -26,7 +27,7 @@ python3 spdlog tiff tinygltf +tinyxml2 tl-expected glad glfw3 -tinyxml2 diff --git a/thirdparty/install.bat b/thirdparty/install.bat index 5a056db16a4f..5f2a623cf64d 100644 --- a/thirdparty/install.bat +++ b/thirdparty/install.bat @@ -17,10 +17,10 @@ if errorlevel 1 ( REM Set VCPKG_BINARY_SOURCES based on the option if !write_s3_option! equ true ( - set "VCPKG_BINARY_SOURCES=clear;x-aws,s3://vcpkg-export/2024.07.12/x64-windows-meshlib/,readwrite;" + set "VCPKG_BINARY_SOURCES=clear;x-aws,s3://vcpkg-export/2024.10.21/x64-windows-meshlib/,readwrite;" echo "using aws auth" ) else ( - set "VCPKG_BINARY_SOURCES=clear;x-aws-config,no-sign-request;x-aws,s3://vcpkg-export/2024.07.12/x64-windows-meshlib/,readwrite;" + set "VCPKG_BINARY_SOURCES=clear;x-aws-config,no-sign-request;x-aws,s3://vcpkg-export/2024.10.21/x64-windows-meshlib/,readwrite;" echo "using no auth" ) )