From 74020a397a2b2b04bac853953dca7f6f6514d69f Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Wed, 14 Oct 2020 12:15:56 -0700 Subject: [PATCH] make Curl default option to build on Win as a temp workaround (#753) * make Curl default option to build on Win as a temp workaround * Temporarily disable setting WinHTTP as a transport adapter since it hasn't been implemented yet, to unblock building master. Co-authored-by: Ahson Khan --- cmake-modules/DefineTransportAdapter.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake-modules/DefineTransportAdapter.cmake b/cmake-modules/DefineTransportAdapter.cmake index b33f65c20..35f5a6cc8 100644 --- a/cmake-modules/DefineTransportAdapter.cmake +++ b/cmake-modules/DefineTransportAdapter.cmake @@ -9,14 +9,8 @@ # Defines `BUILD_TRANSPORT_WINHTTP_ADAPTER` and `BUILD_CURL_HTTP_TRANSPORT_ADAPTER` for source code if (WIN32 OR MINGW OR MSYS OR CYGWIN) - if(BUILD_TRANSPORT_CURL) - add_compile_definitions(BUILD_CURL_HTTP_TRANSPORT_ADAPTER) - endif() - # Make sure to build WinHTTP either if was user-requested or no transport was selected at all - if(BUILD_TRANSPORT_WINHTTP OR NOT BUILD_TRANSPORT_CURL) - add_compile_definitions(BUILD_TRANSPORT_WINHTTP_ADAPTER) - SET(BUILD_TRANSPORT_WINHTTP ON) - endif() + add_compile_definitions(BUILD_CURL_HTTP_TRANSPORT_ADAPTER) + SET(BUILD_TRANSPORT_CURL ON) elseif(UNIX) if(BUILD_TRANSPORT_WINHTTP) message(FATAL_ERROR "Win HTTP transport adapter is not supported for Unix platforms")