mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 13:38:59 +08:00
b224213946
* [curl] Update to 7.86.0 * [azure-core-cpp] Add missing Ws2_32.lib. Filed upstream as https://github.com/Azure/azure-sdk-for-cpp/pull/4127 * [aws-sdk-cpp] Lock the selected curl features. Co-authored-by: FrankXie <v-frankxie@microsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
21 lines
912 B
Diff
21 lines
912 B
Diff
diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
|
|
index c44546b0e..b66888362 100644
|
|
--- a/aws-cpp-sdk-core/CMakeLists.txt
|
|
+++ b/aws-cpp-sdk-core/CMakeLists.txt
|
|
@@ -113,13 +113,8 @@ if(ENABLE_CURL_CLIENT)
|
|
int main() {
|
|
CURL* handle = curl_easy_init();
|
|
return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }")
|
|
- if (CMAKE_CROSSCOMPILING)
|
|
- check_c_source_compiles("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
|
|
- check_c_source_compiles("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
|
|
- else()
|
|
- check_c_source_runs("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
|
|
- check_c_source_runs("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
|
|
- endif()
|
|
+ set(CURL_HAS_H2 OFF)
|
|
+ set(CURL_HAS_TLS_PROXY ON)
|
|
elseif(ENABLE_WINDOWS_CLIENT)
|
|
# NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2
|
|
if(USE_IXML_HTTP_REQUEST_2)
|