romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 16:03:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

or higher -> or greater 5 cmake

Browse source
This commit is contained in:
Viktor Szakats 2026-05-26 18:41:50 +02:00
parent 0e4d961a41
commit 13af664848
No known key found for this signature in database
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMake/PickyWarnings.cmake
View file

@ -97,7 +97,7 @@ if(PICKY_COMPILER)
# to suppress undesired warnings in case -Weverything is passed as a custom option.
# Assume these options always exist with both clang and gcc.
# Require clang 3.0 / gcc 2.95 or higher.
# Require clang 3.0 / gcc 2.95 or greater.
list(APPEND _picky_enable
-Wbad-function-cast # clang 2.7 gcc 2.95
-Wconversion # clang 2.7 gcc 2.95
@ -215,7 +215,7 @@ if(PICKY_COMPILER)
if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0) OR
(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12))
list(APPEND _picky_enable
-Wimplicit-fallthrough # clang 4.0 gcc 7.0 appleclang 9.0 # We do silencing for clang 10.0 or higher only
-Wimplicit-fallthrough # clang 4.0 gcc 7.0 appleclang 9.0 # We do silencing for clang 10.0 or greater only
-Wxor-used-as-pow # clang 10.0 gcc 13.0 appleclang 12.0
)
endif()

2
CMake/curl-config.in.cmake
View file

@ -30,7 +30,7 @@ option(CURL_USE_PKGCONFIG "Enable pkg-config to detect @PROJECT_NAME@ dependenci
if(CMAKE_VERSION VERSION_LESS @CMAKE_MINIMUM_REQUIRED_VERSION@)
message(STATUS "@PROJECT_NAME@: @PROJECT_NAME@-specific Find modules require "
"CMake @CMAKE_MINIMUM_REQUIRED_VERSION@ or higher, found: ${CMAKE_VERSION}.")
"CMake @CMAKE_MINIMUM_REQUIRED_VERSION@ or greater, found: ${CMAKE_VERSION}.")
endif()
include(CMakeFindDependencyMacro)

2
CMake/unix-cache.cmake
View file

@ -256,7 +256,7 @@ set(HAVE_STRINGS_H 1)
if(_CURL_OLD_LINUX)
set(HAVE_STROPTS_H 1)
else()
set(HAVE_STROPTS_H 0) # glibc 2.30 or higher. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
set(HAVE_STROPTS_H 0) # glibc 2.30 or greater. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
endif()
set(HAVE_STRUCT_SOCKADDR_STORAGE 1)
set(HAVE_STRUCT_TIMEVAL 1)

14
CMakeLists.txt
View file

@ -229,7 +229,7 @@ if(WIN32)
if(MINGW64_VERSION)
message(STATUS "Found MINGW64_VERSION=${MINGW64_VERSION}")
if(MINGW64_VERSION VERSION_LESS 3.0)
message(FATAL_ERROR "mingw-w64 3.0 or higher is required")
message(FATAL_ERROR "mingw-w64 3.0 or greater is required")
endif()
endif()
endif()
@ -883,7 +883,7 @@ endif()
if(CURL_USE_MBEDTLS)
find_package(MbedTLS MODULE REQUIRED)
if(MBEDTLS_VERSION VERSION_LESS 3.2.0)
message(FATAL_ERROR "mbedTLS v3.2.0 or higher is required.")
message(FATAL_ERROR "mbedTLS v3.2.0 or greater is required.")
endif()
set(_ssl_enabled ON)
set(USE_MBEDTLS ON)
@ -917,7 +917,7 @@ if(CURL_USE_WOLFSSL)
set(_curl_ca_bundle_supported TRUE)
if(USE_OPENSSL AND WOLFSSL_VERSION VERSION_LESS 5.7.6)
message(FATAL_ERROR "wolfSSL 5.7.6 or higher is required to coexist with OpenSSL.")
message(FATAL_ERROR "wolfSSL 5.7.6 or greater is required to coexist with OpenSSL.")
endif()
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "WOLFSSL_OPTIONS_IGNORE_SYS")
@ -939,7 +939,7 @@ if(CURL_USE_GNUTLS)
if(NOT DEFINED HAVE_GNUTLS_SRP AND NOT CURL_DISABLE_SRP)
cmake_push_check_state()
list(APPEND CMAKE_REQUIRED_LIBRARIES CURL::gnutls)
# In GnuTLS 3.8.0 (2023-02-10) or higher, this check always succeeds.
# In GnuTLS 3.8.0 (2023-02-10) or greater, this check always succeeds.
# Detecting actual TLS-SRP support needs poking the API at runtime.
check_symbol_exists("gnutls_srp_verifier" "gnutls/gnutls.h" HAVE_GNUTLS_SRP)
cmake_pop_check_state()
@ -963,7 +963,7 @@ if(CURL_USE_RUSTLS)
endif()
endif()
if(NOT HAVE_RUSTLS_SUPPORTED_HPKE)
message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or higher.")
message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or greater.")
endif()
if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "rustls")
@ -1002,7 +1002,7 @@ if(ZSTD_FOUND)
set(HAVE_ZSTD ON)
list(APPEND CURL_LIBS CURL::zstd)
else()
message(WARNING "zstd v1.0.0 or higher is required, disabling zstd support.")
message(WARNING "zstd v1.0.0 or greater is required, disabling zstd support.")
endif()
endif()
@ -1143,7 +1143,7 @@ if(USE_NGTCP2)
elseif(OPENSSL_VERSION VERSION_GREATER_EQUAL 3.5.0)
find_package(NGTCP2 MODULE REQUIRED COMPONENTS "ossl")
if(NGTCP2_VERSION VERSION_LESS 1.12.0)
message(FATAL_ERROR "ngtcp2 1.12.0 or higher required for OpenSSL")
message(FATAL_ERROR "ngtcp2 1.12.0 or greater required for OpenSSL")
endif()
set(OPENSSL_QUIC_API2 1)
elseif(HAVE_LIBRESSL)