cmake: rename Find modules

- `FindCARES` -> `FindCares` - `FindLibPSL` -> `FindLibpsl` - `FindLibSSH2` -> `FindLibssh2` - `FindQUICHE` -> `FindQuiche` - `Findrustls` -> `FindRustls` Our convention for naming Find modules (the part after the `Find` prefix, also called as 'package name') is: Always start with uppercase. Follow with lowercase, unless there is a clear preference for a stylized name. E.g. the project itself uses it that way with a matching `<Name>Config.cmake` file, or we use it that way elsewhere, or the name is an acronym. Ref: #14580 Closes #14601
2024-08-20 00:47:55 +02:00 · 2024-08-20 00:47:55 +02:00 · 211cbcb4f6
commit 211cbcb4f6
parent 3a2e47afb7
8 changed files with 18 additions and 18 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -120,7 +120,7 @@ HTTP/2:
  - all:
      - changed-files:
          - any-glob-to-all-files:
-              - '{CMake/FindNGHTTP2.cmake,CMake/FindQUICHE.cmake,docs/HTTP2.md,docs/libcurl/opts/CURLOPT_STREAM*,docs/examples/http2*,lib/http2*,tests/http2-server.pl}'
+              - '{CMake/FindNGHTTP2.cmake,CMake/FindQuiche.cmake,docs/HTTP2.md,docs/libcurl/opts/CURLOPT_STREAM*,docs/examples/http2*,lib/http2*,tests/http2-server.pl}'

 HTTP/3:
  - all:
@ -200,7 +200,7 @@ SCP/SFTP:
  - all:
      - changed-files:
          - any-glob-to-all-files:
-              - '{CMake/FindLibSSH2.cmake,docs/libcurl/opts/CURLOPT_SSH*,docs/examples/sftp*,lib/vssh/**,tests/sshhelp.pm,tests/sshserver.pl}'
+              - '{CMake/FindLibssh2.cmake,docs/libcurl/opts/CURLOPT_SSH*,docs/examples/sftp*,lib/vssh/**,tests/sshhelp.pm,tests/sshserver.pl}'

 script:
  - all:
@ -236,7 +236,7 @@ TLS:
  - all:
      - changed-files:
          - any-glob-to-all-files:
-              - '{CMake/FindBearSSL.cmake,CMake/FindMbedTLS.cmake,CMake/FindWolfSSL.cmake,CMake/Findrustls.cmake,docs/examples/ssl*,docs/examples/*ssl.*,docs/examples/*tls.*,docs/SSL*,docs/libcurl/curl_global_sslset*,docs/libcurl/opts/CURLINFO_CA*,docs/libcurl/opts/CURLINFO_CERT*,docs/libcurl/opts/CURLINFO_SSL*,docs/libcurl/opts/CURLINFO_TLS*,docs/libcurl/opts/CURLOPT_CA*,docs/libcurl/opts/CURLOPT_CERT*,docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY*,docs/libcurl/opts/CURLOPT_SSL*,docs/libcurl/opts/CURLOPT_TLS*,docs/libcurl/opts/CURLOPT_USE_SSL*,lib/vtls/**,m4/curl-bearssl.m4,m4/curl-gnutls.m4,m4/curl-mbedtls.m4,m4/curl-openssl.m4,m4/curl-rustls.m4,m4/curl-schannel.m4,m4/curl-sectransp.m4,m4/curl-wolfssl.m4}'
+              - '{CMake/FindBearSSL.cmake,CMake/FindMbedTLS.cmake,CMake/FindWolfSSL.cmake,CMake/FindRustls.cmake,docs/examples/ssl*,docs/examples/*ssl.*,docs/examples/*tls.*,docs/SSL*,docs/libcurl/curl_global_sslset*,docs/libcurl/opts/CURLINFO_CA*,docs/libcurl/opts/CURLINFO_CERT*,docs/libcurl/opts/CURLINFO_SSL*,docs/libcurl/opts/CURLINFO_TLS*,docs/libcurl/opts/CURLOPT_CA*,docs/libcurl/opts/CURLOPT_CERT*,docs/libcurl/opts/CURLOPT_PINNEDPUBLICKEY*,docs/libcurl/opts/CURLOPT_SSL*,docs/libcurl/opts/CURLOPT_TLS*,docs/libcurl/opts/CURLOPT_USE_SSL*,lib/vtls/**,m4/curl-bearssl.m4,m4/curl-gnutls.m4,m4/curl-mbedtls.m4,m4/curl-openssl.m4,m4/curl-rustls.m4,m4/curl-schannel.m4,m4/curl-sectransp.m4,m4/curl-wolfssl.m4}'

 URL:
  - all:
--- a/CMake/FindCares.cmake
+++ b/CMake/FindCares.cmake
@ -64,7 +64,7 @@ elseif(CARES_INCLUDE_DIR AND EXISTS "${CARES_INCLUDE_DIR}/ares_version.h")
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CARES
+find_package_handle_standard_args(Cares
  REQUIRED_VARS
    CARES_INCLUDE_DIR
    CARES_LIBRARY
--- a/CMake/FindLibpsl.cmake
+++ b/CMake/FindLibpsl.cmake
@ -64,7 +64,7 @@ elseif(LIBPSL_INCLUDE_DIR AND EXISTS "${LIBPSL_INCLUDE_DIR}/libpsl.h")
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibPSL
+find_package_handle_standard_args(Libpsl
  REQUIRED_VARS
    LIBPSL_INCLUDE_DIR
    LIBPSL_LIBRARY
--- a/CMake/FindLibssh2.cmake
+++ b/CMake/FindLibssh2.cmake
@ -64,7 +64,7 @@ elseif(LIBSSH2_INCLUDE_DIR AND EXISTS "${LIBSSH2_INCLUDE_DIR}/libssh2.h")
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibSSH2
+find_package_handle_standard_args(Libssh2
  REQUIRED_VARS
    LIBSSH2_INCLUDE_DIR
    LIBSSH2_LIBRARY
--- a/CMake/FindQuiche.cmake
+++ b/CMake/FindQuiche.cmake
@ -57,7 +57,7 @@ if(PC_QUICHE_VERSION)
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QUICHE
+find_package_handle_standard_args(Quiche
  REQUIRED_VARS
    QUICHE_INCLUDE_DIR
    QUICHE_LIBRARY
--- a/CMake/FindRustls.cmake
+++ b/CMake/FindRustls.cmake
@ -57,7 +57,7 @@ if(PC_RUSTLS_VERSION)
 endif()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(rustls
+find_package_handle_standard_args(Rustls
  REQUIRED_VARS
    RUSTLS_INCLUDE_DIR
    RUSTLS_LIBRARY
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -221,7 +221,7 @@ set(LIBCURL_PC_REQUIRES_PRIVATE "")

 if(ENABLE_ARES)
  set(USE_ARES 1)
-  find_package(CARES REQUIRED)
+  find_package(Cares REQUIRED)
  list(APPEND CURL_LIBS ${CARES_LIBRARIES})
  list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libcares")
  add_definitions("-DCARES_NO_DEPRECATED")  # Ignore c-ares deprecation warnings
@ -637,7 +637,7 @@ if(CURL_USE_GNUTLS)
 endif()

 if(CURL_USE_RUSTLS)
-  find_package(rustls REQUIRED)
+  find_package(Rustls REQUIRED)
  set(_ssl_enabled ON)
  set(USE_RUSTLS ON)
  list(APPEND CURL_LIBS ${RUSTLS_LIBRARIES})
@ -830,7 +830,7 @@ if(USE_QUICHE)
  if(USE_NGTCP2)
    message(FATAL_ERROR "Only one HTTP/3 backend can be selected!")
  endif()
-  find_package(QUICHE REQUIRED)
+  find_package(Quiche REQUIRED)
  if(NOT HAVE_BORINGSSL)
    message(FATAL_ERROR "quiche requires BoringSSL")
  endif()
@ -1045,7 +1045,7 @@ mark_as_advanced(CURL_USE_LIBPSL)
 set(USE_LIBPSL OFF)

 if(CURL_USE_LIBPSL)
-  find_package(LibPSL)  # TODO: add REQUIRED to match autotools
+  find_package(Libpsl)  # TODO: add REQUIRED to match autotools
  if(LIBPSL_FOUND)
    list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl")
@ -1063,7 +1063,7 @@ mark_as_advanced(CURL_USE_LIBSSH2)
 set(USE_LIBSSH2 OFF)

 if(CURL_USE_LIBSSH2)
-  find_package(LibSSH2)
+  find_package(Libssh2)
  if(LIBSSH2_FOUND)
    list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2")
--- a/Makefile.am
+++ b/Makefile.am
@ -34,21 +34,21 @@ CMAKE_DIST =                                    \
 CMake/CurlTests.c                              \
 CMake/FindBearSSL.cmake                        \
 CMake/FindBrotli.cmake                         \
- CMake/FindCARES.cmake                          \
+ CMake/FindCares.cmake                          \
 CMake/FindGSS.cmake                            \
- CMake/FindLibPSL.cmake                         \
- CMake/FindLibSSH2.cmake                        \
+ CMake/FindLibpsl.cmake                         \
+ CMake/FindLibssh2.cmake                        \
 CMake/FindMbedTLS.cmake                        \
 CMake/FindMSH3.cmake                           \
 CMake/FindNGHTTP2.cmake                        \
 CMake/FindNGHTTP3.cmake                        \
 CMake/FindNGTCP2.cmake                         \
 CMake/FindNettle.cmake                         \
- CMake/FindQUICHE.cmake                         \
+ CMake/FindQuiche.cmake                         \
+ CMake/FindRustls.cmake                         \
 CMake/FindWolfSSH.cmake                        \
 CMake/FindWolfSSL.cmake                        \
 CMake/FindZstd.cmake                           \
- CMake/Findrustls.cmake                         \
 CMake/Macros.cmake                             \
 CMake/OtherTests.cmake                         \
 CMake/PickyWarnings.cmake                      \