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

microsoft#34883) Co-authored-by: Anton Kolesnyk <[email protected]>
m-kuhn · Nov 5, 2023 · 8acbab7 · 8acbab7
1 parent 06f19b6
commit 8acbab7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/ports/azure-storage-common-cpp/fix-clang-on-windows.patch b/ports/azure-storage-common-cpp/fix-clang-on-windows.patch
@@ -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})
diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake
@@ -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")

diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json
@@ -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."

diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8a12fa7967664e0823c8ab1be3ef80ba4faf9245",
+      "version-semver": "12.4.0",
+      "port-version": 2
+    },
     {
       "git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e",
       "version-semver": "12.4.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -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",