diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-07-03 01:47:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 10:47:54 -0700 |
| commit | 77617e31e31189467823fd83a76d8022f3158935 (patch) | |
| tree | 96b2c1d71091b547d134568b806b0587c9231509 | |
| parent | 9ddf284eceacb2c1bb401ed8ff57abf63195ac46 (diff) | |
| download | vcpkg-77617e31e31189467823fd83a76d8022f3158935.tar.gz vcpkg-77617e31e31189467823fd83a76d8022f3158935.zip | |
[azure-iot-sdk-c] Fix feature name and enable to build (#12209)
* [azure-iot-sdk-c] Fix feature name enable to build
* Update OPTIONS
| -rw-r--r-- | ports/azure-iot-sdk-c/CONTROL | 4 | ||||
| -rw-r--r-- | ports/azure-iot-sdk-c/portfile.cmake | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 5ea703c35..0c6aef0a1 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,5 +1,5 @@ Source: azure-iot-sdk-c -Version: 2020-06-17-1 +Version: 2020-06-17-2 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services Homepage: https://github.com/Azure/azure-iot-sdk-c @@ -8,5 +8,5 @@ Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview] -Feature: use_prov_client +Feature: use-prov-client Description: Enables device provisioning client for DPS diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index e661f5ccd..6d0bec58a 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -24,13 +24,9 @@ else() ) endif() -if("use_prov_client" IN_LIST FEATURES) - message(STATUS "use prov_client") - set(USE_PROV_CLIENT 1) -else() - message(STATUS "NO prov_client") - set(USE_PROV_CLIENT 0) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + use-prov-client use_prov_client +) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/) @@ -38,14 +34,13 @@ file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CUR vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -Dskip_samples=ON -Duse_installed_dependencies=ON -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON - -Duse_prov_client=${USE_PROV_CLIENT} - -Dhsm_type_symm_key=${USE_PROV_CLIENT} + -Dhsm_type_symm_key=${use_prov_client} ) vcpkg_install_cmake() @@ -56,5 +51,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -vcpkg_copy_pdbs() - +vcpkg_copy_pdbs()
\ No newline at end of file |