Bump vcpkg to 2024.10.21 (#3561)

* Update vcpkg tag to 2024.10.21 * requirements/windows.txt += boost-url --------- Co-authored-by: Fedor Chelnokov <fedor.chelnokov@meshinspector.com>
MeshInspector · Nov 7, 2024 · db834cb · db834cb
1 parent aa6268e
commit db834cb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
     )
 )