github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Vcpkg baseline to latest (#4036)

Browse Source 
* vcpkg baseline

* f4b262b259145adb2ab0116a390b08642489d32b

* 79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5

* 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98

* override

* 1.4.1`
This commit is contained in:
George Arama 2022-10-18 15:37:05 -07:00 committed by GitHub
parent 01254a62cd
commit 5f64eea985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-modules/AzureVcpkg.cmake
View File

@ -22,7 +22,7 @@ macro(az_vcpkg_integrate)
if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG}) if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG})
# GET VCPKG FROM SOURCE # GET VCPKG FROM SOURCE
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
set(VCPKG_COMMIT_STRING f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit set(VCPKG_COMMIT_STRING 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98) # default SDK tested commit
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
endif() endif()

6
vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "azure-sdk-for-cpp", "name": "azure-sdk-for-cpp",
"version": "1.5.0", "version": "1.5.0",
"builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69", "builtin-baseline": "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98",
"dependencies": [ "dependencies": [
{ {
"name": "curl" "name": "curl"
@ -25,8 +25,8 @@
], ],
"overrides": [ "overrides": [
{ {
"name": "zlib", "name": "opentelemetry-cpp",
"version": "1.2.12#2" "version": "1.4.1"
} }
] ]
} }