mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-24 14:15:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake: update list of "advanced" variables

Browse Source 
To hide them from the CMake GUI by default.

Closes #14540
This commit is contained in:
Viktor Szakats 2024-08-14 10:11:03 +02:00
parent 1c42ea4066
commit 5abfe451be
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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

1
tests/CMakeLists.txt
View File

@ -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)

11
tests/http/CMakeLists.txt
View File

@ -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)