Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vcpkg baseline to latest #4036

Merged
merged 7 commits into from
Oct 18, 2022
Merged

Vcpkg baseline to latest #4036

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
22faad1
vcpkg baseline
gearama Oct 18, 2022
9e63804
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp i…
gearama Oct 18, 2022
16d7208
f4b262b259145adb2ab0116a390b08642489d32b
gearama Oct 18, 2022
d1c0e2d
79fa9d85cb4510b05c2657bd7ec8a6a2cb266dc5
gearama Oct 18, 2022
d60caab
6ca56aeb457f033d344a7106cb3f9f1abf8f4e98
gearama Oct 18, 2022
a2f21a3
override
gearama Oct 18, 2022
1f91994
1.4.1`
gearama Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake-modules/AzureVcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ macro(az_vcpkg_integrate)
if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_VCPKG})
# GET VCPKG FROM SOURCE
# 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 522aa94e9d261c7d7b2f079bf2591ca62df5c714) # default SDK tested commit
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit
endif()
Expand Down
8 changes: 1 addition & 7 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69",
"builtin-baseline": "522aa94e9d261c7d7b2f079bf2591ca62df5c714",
"dependencies": [
{
"name": "curl"
Expand All @@ -22,11 +22,5 @@
"name": "wil",
"platform": "windows"
}
],
"overrides": [
{
"name": "zlib",
"version": "1.2.12#2"
}
]
}