From: Viktor Szakats Date: Wed, 23 Oct 2024 23:39:59 +0000 (+0200) Subject: cmake: tidy up `CURL_DISABLE_FORM_API` initialization X-Git-Tag: curl-8_11_0~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e94680c9aa3fff7c03770efd5630f640de8d11e;p=thirdparty%2Fcurl.git cmake: tidy up `CURL_DISABLE_FORM_API` initialization Initialization of `CURL_DISABLE_FORM_API` depends on another option. Make sure the other option is initialized before this one. Due to the defaults and logic this did not cause an issue. Also fix the order of two other lines to match with the rest. Closes #15394 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ffde386ebe..12a2907de6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,10 +299,6 @@ option(CURL_DISABLE_DOH "Disable DNS-over-HTTPS" OFF) mark_as_advanced(CURL_DISABLE_DOH) option(CURL_DISABLE_FILE "Disable FILE" OFF) mark_as_advanced(CURL_DISABLE_FILE) -cmake_dependent_option(CURL_DISABLE_FORM_API "Disable form-api" - OFF "NOT CURL_DISABLE_MIME" - ON) -mark_as_advanced(CURL_DISABLE_FORM_API) option(CURL_DISABLE_FTP "Disable FTP" OFF) mark_as_advanced(CURL_DISABLE_FTP) option(CURL_DISABLE_GETOPTIONS "Disable curl_easy_options API for existing options to curl_easy_setopt" OFF) @@ -327,10 +323,14 @@ option(CURL_DISABLE_LIBCURL_OPTION "Disable --libcurl option from the curl tool" mark_as_advanced(CURL_DISABLE_LIBCURL_OPTION) option(CURL_DISABLE_MIME "Disable MIME support" OFF) mark_as_advanced(CURL_DISABLE_MIME) +cmake_dependent_option(CURL_DISABLE_FORM_API "Disable form-api" + OFF "NOT CURL_DISABLE_MIME" + ON) +mark_as_advanced(CURL_DISABLE_FORM_API) option(CURL_DISABLE_MQTT "Disable MQTT" OFF) -mark_as_advanced(CURL_DISABLE_BINDLOCAL) -option(CURL_DISABLE_BINDLOCAL "Disable local binding support" OFF) mark_as_advanced(CURL_DISABLE_MQTT) +option(CURL_DISABLE_BINDLOCAL "Disable local binding support" OFF) +mark_as_advanced(CURL_DISABLE_BINDLOCAL) option(CURL_DISABLE_NETRC "Disable netrc parser" OFF) mark_as_advanced(CURL_DISABLE_NETRC) option(CURL_DISABLE_NTLM "Disable NTLM support" OFF)