luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: tidy up more value comparisons

Browse Source 
- unquote numeric value.

- `NOT LESS` -> `GREATER_EQUAL`.

- replace macro with variable name.
  It also avoids this error when the variable is undefined:
  ```
  CMake Error at CMakeLists.txt:1529 (if):
  if given arguments:
    "GREATER" "4"
  Unknown arguments specified
  ```
  https://github.com/curl/curl/actions/runs/10289921657/job/28478722584#step:30:356

Follow-up to 72ae0d86a4 #14409
Follow-up to acbc6b703f #14197

Closes #14449
This commit is contained in:
Viktor Szakats 2024-08-07 23:40:05 +02:00
parent a3155db43d
commit 2d6fb0f58f
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1526,7 +1526,7 @@ set(CMAKE_REQUIRED_FLAGS)
option(ENABLE_WEBSOCKETS "Set to ON to enable EXPERIMENTAL websockets" OFF) option(ENABLE_WEBSOCKETS "Set to ON to enable EXPERIMENTAL websockets" OFF)
if(ENABLE_WEBSOCKETS) if(ENABLE_WEBSOCKETS)
if(${SIZEOF_CURL_OFF_T} GREATER "4") if(SIZEOF_CURL_OFF_T GREATER 4)
set(USE_WEBSOCKETS ON) set(USE_WEBSOCKETS ON)
else() else()
message(WARNING "curl_off_t is too small to enable WebSockets") message(WARNING "curl_off_t is too small to enable WebSockets")

2
docs/libcurl/CMakeLists.txt
View File

@ -38,7 +38,7 @@ function(add_manual_pages _listname)
set(_eol "_EOL_") set(_eol "_EOL_")
foreach(_file IN LISTS ${_listname} _eol) foreach(_file IN LISTS ${_listname} _eol)
math(EXPR _file_count "${_file_count} + 1") math(EXPR _file_count "${_file_count} + 1")
if(NOT _file_count LESS ${_files_per_batch} OR _file STREQUAL "_EOL_") if(_file_count GREATER_EQUAL _files_per_batch OR _file STREQUAL "_EOL_")
add_custom_command(OUTPUT ${_rofffiles} add_custom_command(OUTPUT ${_rofffiles}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/cd2nroff" -k -d "${CMAKE_CURRENT_BINARY_DIR}" ${_mdfiles} COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/cd2nroff" -k -d "${CMAKE_CURRENT_BINARY_DIR}" ${_mdfiles}