Skip to content

Commit

Permalink
simplify cmake version checks
Browse files Browse the repository at this point in the history
  • Loading branch information
ximex committed Sep 16, 2023
1 parent 8408aa2 commit 767ca7b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/IncludeFindCurl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ unset(CURL_OPENSSL_REQUIRES_CALLBACKS)
find_program(CURL_CONFIG_EXECUTABLE NAMES curl-config)
if(CURL_CONFIG_EXECUTABLE)
set(_min_curl_version_for_ssl_backends "7.58.0")
if ((CURL_VERSION_STRING VERSION_EQUAL "${_min_curl_version_for_ssl_backends}") OR (CURL_VERSION_STRING VERSION_GREATER "${_min_curl_version_for_ssl_backends}"))
if (CURL_VERSION_STRING VERSION_GREATER_EQUAL "${_min_curl_version_for_ssl_backends}")

execute_process(COMMAND ${CURL_CONFIG_EXECUTABLE} --ssl-backends
RESULT_VARIABLE _result_ssl_backends
Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if(Asciidoctor_FOUND)
# Prefer Asciidoctor if it's available

set(_asciidoctor_option_failurelevel)
if((Asciidoctor_VERSION VERSION_GREATER "1.5.7") OR (Asciidoctor_VERSION VERSION_EQUAL "1.5.7"))
if(Asciidoctor_VERSION VERSION_GREATER_EQUAL "1.5.7")
# Asciidoctor 1.5.7+ supports the "--failure-level" CLI option
set(_asciidoctor_option_failurelevel "--failure-level=ERROR")
endif()
Expand Down

0 comments on commit 767ca7b

Please sign in to comment.