mirror of
https://github.com/moparisthebest/curl
synced 2025-02-28 17:31:46 -05:00
parent
a384e870bc
commit
a158a09166
@ -672,6 +672,20 @@ if(CMAKE_USE_LIBSSH2)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# libssh
|
||||||
|
option(CMAKE_USE_LIBSSH "Use libSSH" OFF)
|
||||||
|
mark_as_advanced(CMAKE_USE_LIBSSH)
|
||||||
|
if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH)
|
||||||
|
find_package(libssh CONFIG)
|
||||||
|
if(libssh_FOUND)
|
||||||
|
message(STATUS "Found libssh ${libssh_VERSION}")
|
||||||
|
# Use imported target for include and library paths.
|
||||||
|
list(APPEND CURL_LIBS ssh)
|
||||||
|
set(USE_LIBSSH ON)
|
||||||
|
set(HAVE_LIBSSH_LIBSSH_H 1)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
option(CMAKE_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF)
|
option(CMAKE_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF)
|
||||||
mark_as_advanced(CMAKE_USE_GSSAPI)
|
mark_as_advanced(CMAKE_USE_GSSAPI)
|
||||||
|
|
||||||
@ -1358,8 +1372,8 @@ _add_if("SMB" NOT CURL_DISABLE_SMB AND use_ntlm)
|
|||||||
_add_if("SMBS" NOT CURL_DISABLE_SMB AND SSL_ENABLED AND use_ntlm)
|
_add_if("SMBS" NOT CURL_DISABLE_SMB AND SSL_ENABLED AND use_ntlm)
|
||||||
_add_if("SMTP" NOT CURL_DISABLE_SMTP)
|
_add_if("SMTP" NOT CURL_DISABLE_SMTP)
|
||||||
_add_if("SMTPS" NOT CURL_DISABLE_SMTP AND SSL_ENABLED)
|
_add_if("SMTPS" NOT CURL_DISABLE_SMTP AND SSL_ENABLED)
|
||||||
_add_if("SCP" USE_LIBSSH2)
|
_add_if("SCP" USE_LIBSSH2 OR USE_LIBSSH)
|
||||||
_add_if("SFTP" USE_LIBSSH2)
|
_add_if("SFTP" USE_LIBSSH2 OR USE_LIBSSH)
|
||||||
_add_if("RTSP" NOT CURL_DISABLE_RTSP)
|
_add_if("RTSP" NOT CURL_DISABLE_RTSP)
|
||||||
_add_if("RTMP" USE_LIBRTMP)
|
_add_if("RTMP" USE_LIBRTMP)
|
||||||
_add_if("MQTT" CURL_ENABLE_MQTT)
|
_add_if("MQTT" CURL_ENABLE_MQTT)
|
||||||
@ -1397,6 +1411,14 @@ set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
|
|||||||
set(LIBCURL_LIBS "")
|
set(LIBCURL_LIBS "")
|
||||||
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
|
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
|
||||||
foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
|
foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
|
||||||
|
if(TARGET "${_lib}")
|
||||||
|
set(_libname "${_lib}")
|
||||||
|
get_target_property(_lib "${_lib}" LOCATION)
|
||||||
|
if(NOT _lib)
|
||||||
|
message(WARNING "Bad lib in library list: ${_libname}")
|
||||||
|
continue()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
|
if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
|
||||||
set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")
|
set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}")
|
||||||
else()
|
else()
|
||||||
|
@ -25,8 +25,7 @@ Current flaws in the curl CMake build
|
|||||||
|
|
||||||
- Builds libcurl without large file support
|
- Builds libcurl without large file support
|
||||||
- Does not support all SSL libraries (only OpenSSL, WinSSL, DarwinSSL, and
|
- Does not support all SSL libraries (only OpenSSL, WinSSL, DarwinSSL, and
|
||||||
mbed TLS)
|
mbed TLS, NSS, WolfSSL)
|
||||||
- Doesn't build with SCP and SFTP support (libssh2) (see issue #1155)
|
|
||||||
- Doesn't allow different resolver backends (no c-ares build support)
|
- Doesn't allow different resolver backends (no c-ares build support)
|
||||||
- No RTMP support built
|
- No RTMP support built
|
||||||
- Doesn't allow build curl and libcurl debug enabled
|
- Doesn't allow build curl and libcurl debug enabled
|
||||||
|
@ -428,6 +428,9 @@
|
|||||||
/* Define to 1 if you have the <libssh2.h> header file. */
|
/* Define to 1 if you have the <libssh2.h> header file. */
|
||||||
#cmakedefine HAVE_LIBSSH2_H 1
|
#cmakedefine HAVE_LIBSSH2_H 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <libssh/libssh.h> header file. */
|
||||||
|
#cmakedefine HAVE_LIBSSH_LIBSSH_H 1
|
||||||
|
|
||||||
/* if zlib is available */
|
/* if zlib is available */
|
||||||
#cmakedefine HAVE_LIBZ 1
|
#cmakedefine HAVE_LIBZ 1
|
||||||
|
|
||||||
@ -969,6 +972,9 @@ ${SIZEOF_TIME_T_CODE}
|
|||||||
/* if WolfSSL is enabled */
|
/* if WolfSSL is enabled */
|
||||||
#cmakedefine USE_WOLFSSL 1
|
#cmakedefine USE_WOLFSSL 1
|
||||||
|
|
||||||
|
/* if libSSH is in use */
|
||||||
|
#cmakedefine USE_LIBSSH 1
|
||||||
|
|
||||||
/* if libSSH2 is in use */
|
/* if libSSH2 is in use */
|
||||||
#cmakedefine USE_LIBSSH2 1
|
#cmakedefine USE_LIBSSH2 1
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user