From dd940a5f33e4988febdfed78251d894a47f376db Mon Sep 17 00:00:00 2001 From: seanyen Date: Fri, 24 Apr 2020 17:31:32 -0700 Subject: [PATCH 1/6] Make the CMake config export correctly. --- ports/azure-iot-sdk-c/CONTROL | 2 +- ports/azure-iot-sdk-c/fix-cmake.patch | 40 +++++++++++++++++++++++++++ ports/azure-iot-sdk-c/portfile.cmake | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 ports/azure-iot-sdk-c/fix-cmake.patch diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 06fff28af8d62e..a356bf8acebd9a 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-02-04.1 +Version: 2020-02-04.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 diff --git a/ports/azure-iot-sdk-c/fix-cmake.patch b/ports/azure-iot-sdk-c/fix-cmake.patch new file mode 100644 index 00000000000000..b75b4ca7c86e35 --- /dev/null +++ b/ports/azure-iot-sdk-c/fix-cmake.patch @@ -0,0 +1,40 @@ +diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt +index c39188dca..d4ef43cb3 100644 +--- a/provisioning_client/CMakeLists.txt ++++ b/provisioning_client/CMakeLists.txt +@@ -359,7 +359,7 @@ if(${use_installed_dependencies}) + set(CMAKE_INSTALL_LIBDIR "lib") + endif() + +- install(TARGETS ${provisioning_libs} EXPORT azure_prov_sdksTargets ++ install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin +@@ -374,26 +374,6 @@ if(${use_installed_dependencies}) + VERSION ${PROV_SDK_VERSION} + COMPATIBILITY SameMajorVersion + ) +- +- configure_file("../configs/${PROJECT_NAME}Config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" +- COPYONLY +- ) +- +- install(EXPORT azure_prov_sdksTargets +- FILE +- "${PROJECT_NAME}Targets.cmake" +- DESTINATION +- ${package_location} +- ) +- +- install( +- FILES +- "../configs/${PROJECT_NAME}Config.cmake" +- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION +- ${package_location} +- ) + else() + # Install Provisioning libs + if(NOT DEFINED CMAKE_INSTALL_LIBDIR) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index d15188aa0bc439..078f7d84887996 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -18,7 +18,7 @@ else() REF c8b6a108fd7e01c1d89d9150b5d209f17e54fc4e SHA512 43d7bb9696c9f5d64ec38b017b3b9fcbf86a8a3e8f21b129546b822fe00640f775ca362ec124a8cc37c4c9634de50d88d38952f04a7f4cfc08ad7c25463770ef HEAD_REF master - PATCHES improve-external-deps.patch + PATCHES improve-external-deps.patch fix-cmake.patch ) endif() From 032f8f8471b2d3e307f6b6db481b7ed49f0ee3df Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Mon, 27 Apr 2020 11:49:16 -0700 Subject: [PATCH 2/6] Update CONTROL --- ports/azure-iot-sdk-c/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index a356bf8acebd9a..bc2fbf53e872d0 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-02-04.2 +Version: 2020-02-04.1-1 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 @@ -8,4 +8,4 @@ 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 -Description: Enables device provisioning client for DPS \ No newline at end of file +Description: Enables device provisioning client for DPS From 7a385c9921c99ab38db626a994696ff2084b0697 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Mon, 27 Apr 2020 11:49:51 -0700 Subject: [PATCH 3/6] Update CONTROL --- ports/azure-iot-sdk-c/CONTROL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index bc2fbf53e872d0..286a0f336f50b5 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,7 +1,8 @@ Source: azure-iot-sdk-c Version: 2020-02-04.1-1 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 +Description: A C99 SDK for connecting devices to Microsoft Azure IoT services +Homepage: https://github.com/Azure/azure-iot-sdk-c Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. From 0c120adf9063c5b351ede60b73fc14338a00df3c Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Mon, 27 Apr 2020 11:50:51 -0700 Subject: [PATCH 4/6] Update portfile.cmake --- ports/azure-iot-sdk-c/portfile.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 078f7d84887996..a716beacdd3ef5 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -9,7 +9,9 @@ if("public-preview" IN_LIST FEATURES) REF cb2e8d390df56ffa31d08ca0a79ab58ff96160cc SHA512 6798b17d6768b3ccbd0eb66719b50f364cd951736eb71110e2dc9deca054a1566ff88b9e8c5e9b52536e4308cad6cd3cbebff3282c123083e3afaee5535e724b HEAD_REF public-preview - PATCHES improve-external-deps.patch + PATCHES + improve-external-deps.patch + fix-cmake.patch ) else() vcpkg_from_github( @@ -18,7 +20,9 @@ else() REF c8b6a108fd7e01c1d89d9150b5d209f17e54fc4e SHA512 43d7bb9696c9f5d64ec38b017b3b9fcbf86a8a3e8f21b129546b822fe00640f775ca362ec124a8cc37c4c9634de50d88d38952f04a7f4cfc08ad7c25463770ef HEAD_REF master - PATCHES improve-external-deps.patch fix-cmake.patch + PATCHES + improve-external-deps.patch + fix-cmake.patch ) endif() From 583db793c94df2edc2029dac88d1f1ce906af23b Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Mon, 27 Apr 2020 11:52:02 -0700 Subject: [PATCH 5/6] Update portfile.cmake --- ports/azure-iot-sdk-c/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index a716beacdd3ef5..5dd04edeefbe7e 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_iot_sdks) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c/copyright COPYONLY) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() From 20b2e607a114cad357326febae26f6dcec68b27e Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Tue, 5 May 2020 13:55:13 -0700 Subject: [PATCH 6/6] Update portfile.cmake --- ports/azure-iot-sdk-c/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 5dd04edeefbe7e..ca18914a1e12ef 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if("public-preview" IN_LIST FEATURES)