early-access version 2853

2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions
--- a/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch
+++ b/externals/vcpkg/ports/azure-c-shared-utility/improve-dependencies.patch
@@ -0,0 +1,67 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46334c1..aaeea20 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -115,7 +115,6 @@ if(${use_openssl})
+     if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
+         find_package(OpenSSL REQUIRED)
+     endif()
+-    include_directories(${OPENSSL_INCLUDE_DIR})
+ endif()
+ 
+ if(${use_applessl})
+@@ -521,8 +520,7 @@ if(${use_http})
+             set(CURL_FIND_REQUIRED 1)
+             find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES)
+ 
+-            include_directories(${CURL_INCLUDE_DIRS})
+-            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
+            set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} CURL::libcurl)
+         endif(NOT use_builtin_httpapi)
+     endif()
+ endif(${use_http})
+@@ -561,7 +559,7 @@ if(${use_bearssl})
+ endif()
+ 
+ if(${use_openssl})
+-    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES})
+    set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} OpenSSL::SSL)
+     if (WIN32)
+         set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
+     endif()
+@@ -703,7 +701,7 @@ write_basic_package_version_file(
+ 
+ configure_file("configs/${PROJECT_NAME}Config.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
+-    COPYONLY
+    @ONLY
+ )
+ 
+ install(EXPORT aziotsharedutilTargets
+@@ -715,7 +713,7 @@ install(EXPORT aziotsharedutilTargets
+ 
+ install(
+ FILES
+-    "configs/${PROJECT_NAME}Config.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
+     "configs/${PROJECT_NAME}Functions.cmake"
+     "configs/azure_iot_build_rules.cmake"
+     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
+diff --git a/configs/azure_c_shared_utilityConfig.cmake b/configs/azure_c_shared_utilityConfig.cmake
+index 416dd1c..0e1e4d4 100644
+--- a/configs/azure_c_shared_utilityConfig.cmake
+++ b/configs/azure_c_shared_utilityConfig.cmake
+@@ -1,8 +1,11 @@
+ #Copyright (c) Microsoft. All rights reserved.
+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.
+ 
+-if(UNIX)
+-    include(CMakeFindDependencyMacro)
+include(CMakeFindDependencyMacro)
+if("@use_openssl@")
+    find_dependency(OpenSSL)
+endif()
+if(UNIX AND NOT "@use_builtin_httpapi@")
+     find_dependency(CURL)
+ endif()
+