mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 14:09:02 +08:00
c76e5f092a
* [azure-iot-sdk-c] LTS release 2022-01-21 * bot instructions * bot 2 instructions * Update patches per cmake changes * bot instructions fix * update version * bot instructions Co-authored-by: Mollie Munoz <momuno@microsoft.com> Co-authored-by: Jonliu1993 <13720414433@163.com>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b72bd41ed..02d964fc6 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -388,7 +387,7 @@ endif()
|
|
########## Add install components ##########
|
|
if (${use_installed_dependencies})
|
|
# Install azure_iot_sdks
|
|
- set(package_location "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
|
|
+ set(package_location "cmake")
|
|
|
|
include(CMakePackageConfigHelpers)
|
|
|
|
diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt
|
|
index 39f269d51..ff53ca32d 100644
|
|
--- a/provisioning_client/CMakeLists.txt
|
|
+++ b/provisioning_client/CMakeLists.txt
|
|
@@ -357,7 +357,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_BINDIR}
|
|
@@ -372,26 +372,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)
|