[azure-iot-sdk-c] Fixed the CMake config export. (#11017)

* Make the CMake config export correctly.

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* Update portfile.cmake

* Update portfile.cmake
This commit is contained in:
Sean Yen 2020-05-08 13:33:23 -07:00 committed by GitHub
parent 644ba5d998
commit ce65b330ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 8 deletions

View File

@ -1,11 +1,12 @@
Source: azure-iot-sdk-c
Version: 2020-02-04.1
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.
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
Description: Enables device provisioning client for DPS

View File

@ -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)

View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if("public-preview" IN_LIST FEATURES)
@ -9,7 +7,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 +18,9 @@ else()
REF c8b6a108fd7e01c1d89d9150b5d209f17e54fc4e
SHA512 43d7bb9696c9f5d64ec38b017b3b9fcbf86a8a3e8f21b129546b822fe00640f775ca362ec124a8cc37c4c9634de50d88d38952f04a7f4cfc08ad7c25463770ef
HEAD_REF master
PATCHES improve-external-deps.patch
PATCHES
improve-external-deps.patch
fix-cmake.patch
)
endif()
@ -52,7 +54,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()