Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicole mazzuca (strega-nil) merged 6 commits into from
May 8, 2020
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd940a5
Make the CMake config export correctly.
seanyen Apr 25, 2020
032f8f8
Update CONTROL
seanyen Apr 27, 2020
7a385c9
Update CONTROL
seanyen Apr 27, 2020
0c120ad
Update portfile.cmake
seanyen Apr 27, 2020
583db79
Update portfile.cmake
seanyen Apr 27, 2020
20b2e60
Update portfile.cmake
seanyen May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/azure-iot-sdk-c/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: azure-iot-sdk-c
Version: 2020-02-04.1
Version: 2020-02-04.2
Comment thread
NancyLi1013 marked this conversation as resolved.
Outdated
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
Comment thread
NancyLi1013 marked this conversation as resolved.
Outdated

Expand Down
40 changes: 40 additions & 0 deletions ports/azure-iot-sdk-c/fix-cmake.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion ports/azure-iot-sdk-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
)
endif()

Expand Down