cmake: update list of "advanced" variables

To hide them from the CMake GUI by default.

Closes #14540

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee69fa238405ffc05ba14634f2d49e5d437bf5ab..ed8097f1498d2189c7147672f4f13745534f7aa8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,6 +354,7 @@ if(ENABLE_IPV6 AND NOT WIN32)
     set(_use_core_foundation_and_core_services ON)
 
     find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
+    mark_as_advanced(SYSTEMCONFIGURATION_FRAMEWORK)
     if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
       message(FATAL_ERROR "SystemConfiguration framework not found")
     endif()
@@ -495,6 +496,7 @@ if(CURL_USE_SECTRANSP)
   set(_use_core_foundation_and_core_services ON)
 
   find_library(SECURITY_FRAMEWORK "Security")
+  mark_as_advanced(SECURITY_FRAMEWORK)
   if(NOT SECURITY_FRAMEWORK)
     message(FATAL_ERROR "Security framework not found")
   endif()
@@ -510,7 +512,9 @@ endif()
 
 if(_use_core_foundation_and_core_services)
   find_library(COREFOUNDATION_FRAMEWORK "CoreFoundation")
+  mark_as_advanced(COREFOUNDATION_FRAMEWORK)
   find_library(CORESERVICES_FRAMEWORK "CoreServices")
+  mark_as_advanced(CORESERVICES_FRAMEWORK)
 
   if(NOT COREFOUNDATION_FRAMEWORK)
     message(FATAL_ERROR "CoreFoundation framework not found")
@@ -1218,6 +1222,7 @@ if(_curl_ca_bundle_supported)
   else()
     set(_curl_ca_bundle_set TRUE)
   endif()
+  mark_as_advanced(_curl_ca_bundle_set)
 
   if(CURL_CA_PATH STREQUAL "")
     message(FATAL_ERROR "Invalid value of CURL_CA_PATH. Use 'none', 'auto' or directory path.")
@@ -1231,6 +1236,7 @@ if(_curl_ca_bundle_supported)
   else()
     set(_curl_ca_path_set TRUE)
   endif()
+  mark_as_advanced(_curl_ca_path_set)
 
   if(_curl_ca_bundle_set AND _curl_ca_path_autodetect)
     # Skip auto-detection of unset CA path because CA bundle is set explicitly

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 051bbff599e35ba92c84beb48f6bf0ef10f72b02..22a58c2927a6a4b5954f7fd4ec4fd4deee5abdd9 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,6 +27,7 @@ find_program(TEST_NGHTTPX "nghttpx")
 if(NOT TEST_NGHTTPX)
   set(TEST_NGHTTPX "nghttpx")
 endif()
+mark_as_advanced(TEST_NGHTTPX)
 # Consumed variables: TEST_NGHTTPX
 configure_file("config.in" "${CMAKE_CURRENT_BINARY_DIR}/config" @ONLY)
 

diff --git a/tests/http/CMakeLists.txt b/tests/http/CMakeLists.txt
index d87d980ebc5eee0752228d002df8275ead9c1fd9..aeedad094a1a89e1da12c6f64f4c240c678373ea 100644 (file)
--- a/tests/http/CMakeLists.txt
+++ b/tests/http/CMakeLists.txt
@@ -26,26 +26,37 @@ find_program(CADDY "caddy")  # /usr/bin/caddy
 if(NOT CADDY)
   set(CADDY "")
 endif()
+mark_as_advanced(CADDY)
+
 find_program(VSFTPD "vsftpd")  # /usr/sbin/vsftpd
 if(NOT VSFTPD)
   set(VSFTPD "")
 endif()
+mark_as_advanced(VSFTPD)
+
 find_program(HTTPD "apache2")  # /usr/sbin/apache2
 if(NOT HTTPD)
   set(HTTPD "")
 endif()
+mark_as_advanced(HTTPD)
+
 find_program(APACHECTL "apache2ctl")  # /usr/sbin/apache2ctl
 if(NOT APACHECTL)
   set(APACHECTL "")
 endif()
+mark_as_advanced(APACHECTL)
+
 find_program(APXS "apxs")
 if(NOT APXS)
   set(APXS "")
 endif()
+mark_as_advanced(APXS)
+
 find_program(HTTPD_NGHTTPX "nghttpx" PATHS "/usr/bin" "/usr/local/bin")
 if(NOT HTTPD_NGHTTPX)
   set(HTTPD_NGHTTPX "")
 endif()
+mark_as_advanced(HTTPD_NGHTTPX)
 
 # Consumed variables: APACHECTL, APXS, CADDY, HTTPD, HTTPD_NGHTTPX, VSFTPD
 configure_file("config.ini.in" "${CMAKE_CURRENT_BINARY_DIR}/config.ini" @ONLY)