mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 05:29:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use patch instead of trying to jump to unapproved change in repo

Browse Source
This commit is contained in:
John Spaith 2019-09-26 10:28:03 -07:00
parent ba0c14d3b0
commit 1d4189d1dd
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/azure-iot-sdk-c/cmake-hsm-option.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2c51de83..5d42dc441 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,9 +121,12 @@ if (${use_prov_client})
set(use_prov_client_core ON)
if ("${hsm_custom_lib}" STREQUAL "")
- set(hsm_type_x509 ON)
- set(hsm_type_sastoken ON)
- set(hsm_type_symm_key ON)
+ if ((NOT ${hsm_type_x509}) AND (NOT ${hsm_type_sastoken}) AND (NOT ${hsm_type_symm_key}))
+ # If the cmake option did not explicitly configure an hsm type, then enable them all.
+ set(hsm_type_x509 ON)
+ set(hsm_type_sastoken ON)
+ set(hsm_type_symm_key ON)
+ endif()
else()
set(hsm_type_custom ON)
endif()

2
ports/azure-iot-sdk-c/portfile.cmake
View File

@ -9,7 +9,7 @@ if("public-preview" IN_LIST FEATURES)
REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc
SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f
HEAD_REF public-preview
PATCHES improve-external-deps.patch
PATCHES improve-external-deps.patch cmake-hsm-option.patch
)
else()
vcpkg_from_github(