[azure-storage-common-cpp] Fix compilation when using Clang on Windows (#34883)

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
This commit is contained in:
Anton Kolesnyk 2023-11-05 09:02:05 -08:00 committed by GitHub
parent 06f19b68bd
commit 8acbab7a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
index 9e419922..ba77ab26 100644
--- a/sdk/storage/azure-storage-common/CMakeLists.txt
+++ b/sdk/storage/azure-storage-common/CMakeLists.txt
@@ -97,8 +97,6 @@ target_link_libraries(azure-storage-common PUBLIC Azure::azure-core)
if(WIN32)
target_link_libraries(azure-storage-common PRIVATE bcrypt webservices)
- # C28020 and C28204 are introduced by nlohmann/json
- target_compile_options(azure-storage-common PUBLIC /wd28204 /wd28020)
else()
find_package(LibXml2 REQUIRED)
target_include_directories(azure-storage-common SYSTEM PRIVATE ${LIBXML2_INCLUDE_DIRS})

View File

@ -3,6 +3,8 @@ vcpkg_from_github(
REPO Azure/azure-sdk-for-cpp
REF azure-storage-common_12.4.0
SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd
PATCHES
fix-clang-on-windows.patch
)
if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common")

View File

@ -1,7 +1,7 @@
{
"name": "azure-storage-common-cpp",
"version-semver": "12.4.0",
"port-version": 1,
"port-version": 2,
"description": [
"Microsoft Azure Common Storage SDK for C++",
"This library provides common Azure Storage-related abstractions for Azure SDK."

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8a12fa7967664e0823c8ab1be3ef80ba4faf9245",
"version-semver": "12.4.0",
"port-version": 2
},
{
"git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e",
"version-semver": "12.4.0",

View File

@ -478,7 +478,7 @@
},
"azure-storage-common-cpp": {
"baseline": "12.4.0",
"port-version": 1
"port-version": 2
},
"azure-storage-cpp": {
"baseline": "7.5.0",