From 21270744e3b99a71f59d95bd0f9c0dfd5fc343e9 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 25 Jan 2024 22:36:39 -0800 Subject: [PATCH] fix: fix the vcpkg rev and baseline --- README.md | 2 +- docs/src/project_options_example.md | 2 +- src/Vcpkg.cmake | 2 +- tests/install/vcpkg.json | 4 ++-- tests/myproj/vcpkg.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index abce3787..0725cd70 100644 --- 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 "3b213864579b6fa686e38715508f7cd41a50900f" + VCPKG_REV "6a3dd0874f153f8b375ec26210ea6d41dee3bb26" ) # Set the project name and language diff --git a/docs/src/project_options_example.md b/docs/src/project_options_example.md index 5eb138cf..3e7f98d6 100644 --- 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 "3b213864579b6fa686e38715508f7cd41a50900f" + VCPKG_REV "6a3dd0874f153f8b375ec26210ea6d41dee3bb26" ENABLE_VCPKG_UPDATE ) diff --git a/src/Vcpkg.cmake b/src/Vcpkg.cmake index b5403ff1..8848cc45 100644 --- 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 "3b213864579b6fa686e38715508f7cd41a50900f" + VCPKG_REV "6a3dd0874f153f8b375ec26210ea6d41dee3bb26" ENABLE_VCPKG_UPDATE ) diff --git a/tests/install/vcpkg.json b/tests/install/vcpkg.json index b6e41d6e..e04facb5 100644 --- a/tests/install/vcpkg.json +++ b/tests/install/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "another-project", "version-string": "0.1.0", - "builtin-baseline": "3b213864579b6fa686e38715508f7cd41a50900f", + "builtin-baseline": "6a3dd0874f153f8b375ec26210ea6d41dee3bb26", "dependencies": [ { "name": "eigen3", @@ -10,7 +10,7 @@ }, { "name": "fmt", - "version>=": "10.2.1" + "version>=": "9.1.0#1" } ] } diff --git a/tests/myproj/vcpkg.json b/tests/myproj/vcpkg.json index 5b881878..a2cddbdb 100644 --- a/tests/myproj/vcpkg.json +++ b/tests/myproj/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "myproject", "version-string": "0.1.0", - "builtin-baseline": "3b213864579b6fa686e38715508f7cd41a50900f", + "builtin-baseline": "6a3dd0874f153f8b375ec26210ea6d41dee3bb26", "dependencies": [ { "name": "eigen3", @@ -10,7 +10,7 @@ }, { "name": "fmt", - "version>=": "10.2.1" + "version>=": "9.1.0#1" } ] }