curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-10 22:22:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: drop redundant FOUND checks (libgsasl, libssh, libuv)

Browse Source 
With `find_package(... REQUIRED)` the configuration fails and exits
if the package is not found. The `..._FOUND` check afterwards always
evaluates true and safe to delete.

Also true for brotli and zstd, but those are addressed differently
via #15431.

Closes #15465
This commit is contained in:
Viktor Szakats 2024-10-31 12:26:37 +01:00
parent f58342ae21
commit 05ba353435
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
CMakeLists.txt
View File

@ -1173,17 +1173,15 @@ option(CURL_USE_LIBSSH "Use libssh" OFF)
mark_as_advanced(CURL_USE_LIBSSH) mark_as_advanced(CURL_USE_LIBSSH)
if(NOT USE_LIBSSH2 AND CURL_USE_LIBSSH) if(NOT USE_LIBSSH2 AND CURL_USE_LIBSSH)
find_package(Libssh REQUIRED) find_package(Libssh REQUIRED)
if(LIBSSH_FOUND) list(APPEND CURL_LIBS ${LIBSSH_LIBRARIES})
list(APPEND CURL_LIBS ${LIBSSH_LIBRARIES}) list(APPEND CURL_LIBDIRS ${LIBSSH_LIBRARY_DIRS})
list(APPEND CURL_LIBDIRS ${LIBSSH_LIBRARY_DIRS}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh") include_directories(SYSTEM ${LIBSSH_INCLUDE_DIRS})
include_directories(SYSTEM ${LIBSSH_INCLUDE_DIRS}) link_directories(${LIBSSH_LIBRARY_DIRS})
link_directories(${LIBSSH_LIBRARY_DIRS}) if(LIBSSH_CFLAGS)
if(LIBSSH_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBSSH_CFLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBSSH_CFLAGS}")
endif()
set(USE_LIBSSH ON)
endif() endif()
set(USE_LIBSSH ON)
endif() endif()
# wolfSSH # wolfSSH
@ -1207,17 +1205,15 @@ option(CURL_USE_GSASL "Use libgsasl" OFF)
mark_as_advanced(CURL_USE_GSASL) mark_as_advanced(CURL_USE_GSASL)
if(CURL_USE_GSASL) if(CURL_USE_GSASL)
find_package(Libgsasl REQUIRED) find_package(Libgsasl REQUIRED)
if(LIBGSASL_FOUND) list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES}) list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libgsasl")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libgsasl") include_directories(SYSTEM ${LIBGSASL_INCLUDE_DIRS})
include_directories(SYSTEM ${LIBGSASL_INCLUDE_DIRS}) link_directories(${LIBGSASL_LIBRARY_DIRS})
link_directories(${LIBGSASL_LIBRARY_DIRS}) if(LIBGSASL_CFLAGS)
if(LIBGSASL_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBGSASL_CFLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBGSASL_CFLAGS}")
endif()
set(USE_GSASL ON)
endif() endif()
set(USE_GSASL ON)
endif() endif()
option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF) option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
@ -1284,18 +1280,16 @@ if(CURL_USE_LIBUV)
message(FATAL_ERROR "Using libuv without debug support enabled is useless") message(FATAL_ERROR "Using libuv without debug support enabled is useless")
endif() endif()
find_package(Libuv REQUIRED) find_package(Libuv REQUIRED)
if(LIBUV_FOUND) list(APPEND CURL_LIBS ${LIBUV_LIBRARIES})
list(APPEND CURL_LIBS ${LIBUV_LIBRARIES}) list(APPEND CURL_LIBDIRS ${LIBUV_LIBRARY_DIRS})
list(APPEND CURL_LIBDIRS ${LIBUV_LIBRARY_DIRS}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libuv")
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libuv") include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS}) link_directories(${LIBUV_LIBRARY_DIRS})
link_directories(${LIBUV_LIBRARY_DIRS}) if(LIBUV_CFLAGS)
if(LIBUV_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUV_CFLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUV_CFLAGS}")
endif()
set(USE_LIBUV ON)
set(HAVE_UV_H ON)
endif() endif()
set(USE_LIBUV ON)
set(HAVE_UV_H ON)
endif() endif()
option(USE_LIBRTMP "Enable librtmp from rtmpdump" OFF) option(USE_LIBRTMP "Enable librtmp from rtmpdump" OFF)