]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
cmake: expose CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG
authorRazvan Cojocaru <rzvncj@gmail.com>
Mon, 11 Jan 2021 11:00:36 +0000 (13:00 +0200)
committerJay Satiro <raysatiro@yahoo.com>
Sat, 16 Jan 2021 07:18:12 +0000 (02:18 -0500)
This does for cmake builds what --disable-openssl-auto-load-config
does for autoconf builds.

Closes https://github.com/curl/curl/pull/6435

CMakeLists.txt
lib/curl_config.h.cmake

index 58f4bfb7c755672c27d956a998019659b4f6396c..2384cd49eb8b9d441307ef4a9530ed6b05364578 100644 (file)
@@ -337,6 +337,7 @@ if(WIN32 OR CMAKE_USE_SECTRANSP OR CMAKE_USE_SCHANNEL OR CMAKE_USE_MBEDTLS OR CM
   set(openssl_default OFF)
 endif()
 option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default})
+option(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG "Disable automatic loading of OpenSSL configuration" OFF)
 
 count_true(enabled_ssl_options_count
   CMAKE_USE_SCHANNEL
index 082d76b371b4eecd8790431266fb4db9b6c219bf..d951ae95035eafb41c9e4bdddb566b2ab2334ee4 100644 (file)
@@ -1002,6 +1002,10 @@ ${SIZEOF_TIME_T_CODE}
 /* if OpenSSL is in use */
 #cmakedefine USE_OPENSSL 1
 
+/* Define to 1 if you don't want the OpenSSL configuration to be loaded
+   automatically */
+#cmakedefine CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG 1
+
 /* to enable NGHTTP2  */
 #cmakedefine USE_NGHTTP2 1