From 59b284b6ebdda679e9fa6bb549015f994f4e79c8 Mon Sep 17 00:00:00 2001 From: Raphael Gozzo Date: Sun, 17 Jun 2018 13:26:44 -0300 Subject: [PATCH] cmake: allow multiple SSL backends This will make possible to select the SSL backend (using curl_global_sslset()) even when the libcurl is built using CMake Closes #2665 --- CMakeLists.txt | 2 +- lib/curl_config.h.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d7d76cd8..faa9bddd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,7 +316,7 @@ collect_true(enabled_ssl_options enabled_ssl_options_count CMAKE_USE_MBEDTLS ) if(enabled_ssl_options_count GREATER 1) - message(FATAL_ERROR "Multiple SSL options specified: ${enabled_ssl_options}. Please pick at most one and disable the rest.") + set(CURL_WITH_MULTI_SSL ON) endif() if(CMAKE_USE_WINSSL) diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index a890d8ce6..ab0094be5 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -966,6 +966,9 @@ /* to enable Windows SSL */ #cmakedefine USE_SCHANNEL 1 +/* enable multiple SSL backends */ +#cmakedefine CURL_WITH_MULTI_SSL 1 + /* Define to 1 if using yaSSL in OpenSSL compatibility mode. */ #cmakedefine USE_YASSLEMUL 1