From: Matias N. Goldberg Date: Thu, 20 May 2021 00:23:01 +0000 (-0300) Subject: cmake: fix two invokes result in different curl_config.h X-Git-Tag: curl-7_77_0~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=458a2d85f3a25d6cfb2bcc19675d75b7340bd358;p=thirdparty%2Fcurl.git cmake: fix two invokes result in different curl_config.h Fixes #7100 Closes #7101 Reviewed-by: Jakub Zakrzewski Signed-off-by: Matias N. Goldberg --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fcbf9ed2b6..549a38a6d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -851,7 +851,8 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT) foreach(SEARCH_CA_BUNDLE_PATH ${SEARCH_CA_BUNDLE_PATHS}) if(EXISTS "${SEARCH_CA_BUNDLE_PATH}") message(STATUS "Found CA bundle: ${SEARCH_CA_BUNDLE_PATH}") - set(CURL_CA_BUNDLE "${SEARCH_CA_BUNDLE_PATH}") + set(CURL_CA_BUNDLE "${SEARCH_CA_BUNDLE_PATH}" CACHE STRING + "Path to the CA bundle. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set") break() endif() @@ -860,7 +861,8 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT) if(CURL_CA_PATH_AUTODETECT AND (NOT CURL_CA_PATH_SET)) if(EXISTS "/etc/ssl/certs") - set(CURL_CA_PATH "/etc/ssl/certs") + set(CURL_CA_PATH "/etc/ssl/certs" CACHE STRING + "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set") endif() endif()