mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 20:59:01 +08:00
53e50bc9ee
* [azure-c-shared-utility] Use targets for OpenSSL and CURL * [azure-c-shared-utility] Modernize portfile * [azure-iot-sdk-c] Fix parson dependency * [azure-iot-sdk-c] Modernize portfile * [azure-iot-sdk-c] Fix iothubclient include dirs * [azure-iot-sdk-c] Fix uhttp dependency * Update versions
80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
|
|
index b9c62e8..edf5847 100644
|
|
--- a/configs/azure_iot_sdksConfig.cmake
|
|
+++ b/configs/azure_iot_sdksConfig.cmake
|
|
@@ -1,5 +1,11 @@
|
|
#Copyright (c) Microsoft. All rights reserved.
|
|
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
+include(CMakeFindDependencyMacro)
|
|
+find_dependency(unofficial-parson)
|
|
+find_dependency(uamqp)
|
|
+find_dependency(uhttp)
|
|
+find_dependency(umqtt)
|
|
+find_dependency(azure_c_shared_utility)
|
|
|
|
include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
|
|
|
|
diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
|
index 33b5b8709..45ef7b87a 100644
|
|
--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
|
+++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
|
@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files
|
|
|
|
set(${theseTestsName}_c_files
|
|
../../../certs/certs.c
|
|
- ../../../deps/parson/parson.c
|
|
)
|
|
set(${theseTestsName}_h_files
|
|
../../../certs/certs.h
|
|
- ../../../deps/parson/parson.h
|
|
../common_dt_e2e/iothubclient_common_dt_e2e.h
|
|
)
|
|
|
|
diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
|
index d05d654..5872c8d 100644
|
|
--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
|
+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
|
@@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
|
|
|
|
set(${theseTestsName}_c_files
|
|
../../../certs/certs.c
|
|
- ../../../deps/parson/parson.c
|
|
)
|
|
|
|
set(${theseTestsName}_h_files
|
|
../../../certs/certs.h
|
|
- ../../../deps/parson/parson.h
|
|
../common_dt_e2e/iothubclient_common_dt_e2e.h
|
|
)
|
|
|
|
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
|
|
index 22e24f851..7dc30beba 100644
|
|
--- a/deps/CMakeLists.txt
|
|
+++ b/deps/CMakeLists.txt
|
|
@@ -37,5 +37,8 @@ endif()
|
|
if(NOT ${use_installed_dependencies})
|
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson)
|
|
else()
|
|
- find_package(parson REQUIRED CONFIG)
|
|
+ find_package(unofficial-parson REQUIRED CONFIG)
|
|
+ if(NOT TARGET parson)
|
|
+ add_library(parson ALIAS unofficial::parson::parson)
|
|
+ endif()
|
|
endif()
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b72bd41ed..b2812f1fd 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -242,7 +242,10 @@ endif()
|
|
|
|
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
|
|
if(${use_installed_dependencies})
|
|
- find_package(parson REQUIRED CONFIG)
|
|
+ find_package(unofficial-parson REQUIRED CONFIG)
|
|
+ if(NOT TARGET parson)
|
|
+ add_library(parson ALIAS unofficial::parson::parson)
|
|
+ endif()
|
|
endif()
|
|
|
|
include_directories(${MACRO_UTILS_INC_FOLDER})
|