]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
cmake: sync `CURL_DISABLE_*` behaviour with autotools
authorViktor Szakats <commit@vsz.me>
Fri, 30 Aug 2024 18:42:54 +0000 (20:42 +0200)
committerViktor Szakats <commit@vsz.me>
Sat, 31 Aug 2024 10:00:49 +0000 (12:00 +0200)
- disable RTSP, ALTSVC, HSTS when HTTP is disabled.
  (`./configure` warning deemed unnecessary and not replicated with
  cmake.)

- disable HSTS when there is no TLS backend.

Tested via #14744
Closes #14745

CMakeLists.txt

index 4e846abd4ae8dc0d1e7749d7afb49bde8078a701..3f639e94eb343d03dd45d3f76114cad07728f538 100644 (file)
@@ -330,6 +330,12 @@ mark_as_advanced(CURL_DISABLE_TFTP)
 option(CURL_DISABLE_VERBOSE_STRINGS "Disable verbose strings" OFF)
 mark_as_advanced(CURL_DISABLE_VERBOSE_STRINGS)
 
+if(CURL_DISABLE_HTTP)
+  set(CURL_DISABLE_RTSP ON)
+  set(CURL_DISABLE_ALTSVC ON)
+  set(CURL_DISABLE_HSTS ON)
+endif()
+
 # Corresponds to HTTP_ONLY in lib/curl_setup.h
 option(HTTP_ONLY "Disable all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF)
 mark_as_advanced(HTTP_ONLY)
@@ -492,6 +498,8 @@ count_true(_enabled_ssl_options_count
 )
 if(_enabled_ssl_options_count GREATER 1)
   set(CURL_WITH_MULTI_SSL ON)
+elseif(_enabled_ssl_options_count EQUAL 0)
+  set(CURL_DISABLE_HSTS ON)
 endif()
 
 if(CURL_USE_SCHANNEL)