Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplify cmake version checks #2605

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

simplify cmake version checks #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/IncludeFindCurl.cmake
View file
Open in desktop
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
View file
Open in desktop
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
Loading