mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 14:39:00 +08:00
137 lines
4.4 KiB
Diff
137 lines
4.4 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,10 @@
|
|
#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(umqtt)
|
|
+find_dependency(azure_c_shared_utility)
|
|
|
|
include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
|
|
|
|
diff --git a/dependencies.cmake b/dependencies.cmake
|
|
index 063733a..71bfc7d 100644
|
|
--- a/dependencies.cmake
|
|
+++ b/dependencies.cmake
|
|
@@ -18,6 +18,8 @@ if(${use_installed_dependencies})
|
|
endif()
|
|
endif()
|
|
|
|
+ find_package(unofficial-parson REQUIRED)
|
|
+ link_libraries(unofficial::parson::parson)
|
|
else()
|
|
add_subdirectory(c-utility)
|
|
|
|
diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt
|
|
index e6d000a..70ade26 100644
|
|
--- a/iothub_client/CMakeLists.txt
|
|
+++ b/iothub_client/CMakeLists.txt
|
|
@@ -24,22 +24,6 @@ set(install_staticlibs
|
|
iothub_client
|
|
)
|
|
|
|
-add_library(parson
|
|
- ../deps/parson/parson.c
|
|
-)
|
|
-
|
|
-if(MSVC)
|
|
- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
|
|
-endif()
|
|
-
|
|
-set(install_staticlibs ${install_staticlibs}
|
|
- parson
|
|
-)
|
|
-
|
|
-set(iothub_client_libs ${iothub_client_libs}
|
|
- parson
|
|
-)
|
|
-
|
|
if(NOT dont_use_uploadtoblob)
|
|
set(iothub_client_ll_transport_c_files
|
|
${iothub_client_ll_transport_c_files}
|
|
diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
|
index 161872a..d53e111 100644
|
|
--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
|
+++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/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/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
|
|
index d472161..b0291e8 100644
|
|
--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
|
|
+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e/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/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/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt
|
|
index 11a9a9a..4097293 100644
|
|
--- a/iothub_service_client/CMakeLists.txt
|
|
+++ b/iothub_service_client/CMakeLists.txt
|
|
@@ -72,9 +72,7 @@ endif()
|
|
setSdkTargetBuildProperties(iothub_service_client)
|
|
|
|
if(NOT ${nuget_e2e_tests})
|
|
- target_link_libraries(iothub_service_client uamqp parson)
|
|
-else()
|
|
- target_link_libraries(iothub_service_client parson)
|
|
+ target_link_libraries(iothub_service_client uamqp)
|
|
endif()
|
|
|
|
if (NOT ${ARCHITECTURE} STREQUAL "ARM")
|
|
diff --git a/serializer/CMakeLists.txt b/serializer/CMakeLists.txt
|
|
index 0f6dc74..b4f784c 100644
|
|
--- a/serializer/CMakeLists.txt
|
|
+++ b/serializer/CMakeLists.txt
|
|
@@ -87,10 +87,6 @@ else()
|
|
endif()
|
|
setSdkTargetBuildProperties(serializer)
|
|
|
|
-target_link_libraries(serializer
|
|
- parson
|
|
-)
|
|
-
|
|
if (NOT ${skip_samples})
|
|
if(WIN32)
|
|
if (NOT ${ARCHITECTURE} STREQUAL "ARM")
|