ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index a8011fb..9fc05c7 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -155,17 +155,6 @@ endif()
   6  # Use solution folders.
   7  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
   8
   9 -# build the parson library for json parsing
  10 -add_library(parson
  11 -    ./deps/parson/parson.c
  12 -    ./deps/parson/parson.h
  13 -)
  14 -if (MSVC)
  15 -    set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
  16 -endif()
  17 -set(parson_h_install_files ./deps/parson/parson.h)
  18 -set(parson_install_libs parson)
  19 -
  20  if (IN_OPENWRT)
  21      ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
  22      INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
  23 diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
  24 index b9c62e8..edf5847 100644
  25 --- a/configs/azure_iot_sdksConfig.cmake
  26 +++ b/configs/azure_iot_sdksConfig.cmake
  27 @@ -1,5 +1,10 @@
  28  #Copyright (c) Microsoft. All rights reserved.
  29  #Licensed under the MIT license. See LICENSE file in the project root for full license information.
  30 +include(CMakeFindDependencyMacro)
  31 +find_dependency(unofficial-parson)
  32 +find_dependency(uamqp)
  33 +find_dependency(umqtt)
  34 +find_dependency(azure_c_shared_utility)
  35
  36  include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
  37
  38 diff --git a/dependencies.cmake b/dependencies.cmake
  39 index fd06df6..c0e06fa 100644
  40 --- a/dependencies.cmake
  41 +++ b/dependencies.cmake
  42 @@ -18,6 +18,9 @@ if(${use_installed_dependencies})
  43          endif ()
  44      endif ()
  45
  46 +    find_package(unofficial-parson REQUIRED)
  47 +    link_libraries(unofficial::parson::parson)
  48 +
  49  else ()
  50      add_subdirectory(c-utility)
  51
  52 diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
  53 index 161872a..d53e111 100644
  54 --- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
  55 +++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
  56 @@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
  57
  58  set(${theseTestsName}_c_files
  59      ../../../certs/certs.c
  60 -    ../../../deps/parson/parson.c
  61  )
  62
  63  set(${theseTestsName}_h_files
  64      ../../../certs/certs.h
  65 -    ../../../deps/parson/parson.h
  66      ../common_dt_e2e/iothubclient_common_dt_e2e.h
  67  )
  68
  69 diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
  70 index d472161..b0291e8 100644
  71 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
  72 +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e/CMakeLists.txt
  73 @@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
  74
  75  set(${theseTestsName}_c_files
  76      ../../../certs/certs.c
  77 -    ../../../deps/parson/parson.c
  78  )
  79
  80  set(${theseTestsName}_h_files
  81      ../../../certs/certs.h
  82 -    ../../../deps/parson/parson.h
  83      ../common_dt_e2e/iothubclient_common_dt_e2e.h
  84  )
  85
  86 diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
  87 index d05d654..5872c8d 100644
  88 --- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
  89 +++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
  90 @@ -31,12 +31,10 @@ set(${theseTestsName}_nuget_c_files
  91
  92  set(${theseTestsName}_c_files
  93      ../../../certs/certs.c
  94 -    ../../../deps/parson/parson.c
  95  )
  96
  97  set(${theseTestsName}_h_files
  98      ../../../certs/certs.h
  99 -    ../../../deps/parson/parson.h
 100      ../common_dt_e2e/iothubclient_common_dt_e2e.h
 101  )
 102
 103 diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt
 104 index e47473e..b073513 100644
 105 --- a/iothub_service_client/CMakeLists.txt
 106 +++ b/iothub_service_client/CMakeLists.txt
 107 @@ -81,9 +81,7 @@ endif()
 108  setSdkTargetBuildProperties(iothub_service_client)
 109
 110  if(NOT ${nuget_e2e_tests})
 111 -    target_link_libraries(iothub_service_client uamqp parson)
 112 -else()
 113 -    target_link_libraries(iothub_service_client parson)
 114 +    target_link_libraries(iothub_service_client uamqp)
 115  endif()
 116
 117  if (NOT ${ARCHITECTURE} STREQUAL "ARM")