test: update vcpkg in the tests

aminya · Jan 25, 2024 · bd1c6c2 · bd1c6c2
1 parent 98d8183
commit bd1c6c2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "0fa8459cf3a7caca7adc58f992bc32ff13630684"
+    VCPKG_REV "3b213864579b6fa686e38715508f7cd41a50900f"
 )
 
 # Set the project name and language

diff --git a/docs/src/project_options_example.md b/docs/src/project_options_example.md
@@ -30,7 +30,7 @@ include(${_project_options_SOURCE_DIR}/Index.cmake)
 # install vcpkg dependencies: - should be called before defining project()
 run_vcpkg(
     VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-    VCPKG_REV "0fa8459cf3a7caca7adc58f992bc32ff13630684"
+    VCPKG_REV "3b213864579b6fa686e38715508f7cd41a50900f"
     ENABLE_VCPKG_UPDATE
 )
 

diff --git a/src/Vcpkg.cmake b/src/Vcpkg.cmake
@@ -156,7 +156,7 @@ Or by specifying the options
 
    run_vcpkg(
        VCPKG_URL "https://github.com/microsoft/vcpkg.git"
-       VCPKG_REV "0fa8459cf3a7caca7adc58f992bc32ff13630684"
+       VCPKG_REV "3b213864579b6fa686e38715508f7cd41a50900f"
        ENABLE_VCPKG_UPDATE
    )
 

diff --git a/tests/install/vcpkg.json b/tests/install/vcpkg.json
@@ -1,16 +1,16 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "another-project",
   "version-string": "0.1.0",
-  "builtin-baseline": "8dbd66f5a7821ced1ed57696b50375a977006813",
+  "builtin-baseline": "3b213864579b6fa686e38715508f7cd41a50900f",
   "dependencies": [
     {
       "name": "eigen3",
-      "version>=": "3.4.0"
+      "version>=": "3.4.0#2"
     },
     {
       "name": "fmt",
-      "version>=": "8.1.1"
+      "version>=": "10.2.1"
     }
   ]
 }
diff --git a/tests/myproj/vcpkg.json b/tests/myproj/vcpkg.json
@@ -1,16 +1,16 @@
 {
-  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "myproject",
   "version-string": "0.1.0",
-  "builtin-baseline": "8dbd66f5a7821ced1ed57696b50375a977006813",
+  "builtin-baseline": "3b213864579b6fa686e38715508f7cd41a50900f",
   "dependencies": [
     {
       "name": "eigen3",
-      "version>=": "3.4.0"
+      "version>=": "3.4.0#2"
     },
     {
       "name": "fmt",
-      "version>=": "8.1.1"
+      "version>=": "10.2.1"
     }
   ]
 }
diff --git a/tests/rpi4-vcpkg/vcpkg.json b/tests/rpi4-vcpkg/vcpkg.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "example",
   "version-string": "0.1.0",
   "dependencies": [