diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2020-12-08 23:18:39 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-12-09 22:35:25 +0000 |
| commit | 86e23155fef6d8ed0e3c34c40281eada1cd7945c (patch) | |
| tree | 0931fe96a8a9f4d7f2d377745b14dcd4df0acf6a /cmake | |
| parent | 10377c4d92f9ac310f7e7878890e066d17cb37ba (diff) | |
Windows: upgrade libssh to 0.9.5
Closes #17065
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindLIBSSH.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake index 91504a48ae..1a758a1adb 100644 --- a/cmake/modules/FindLIBSSH.cmake +++ b/cmake/modules/FindLIBSSH.cmake @@ -66,7 +66,7 @@ else () if(NOT EXISTS "${_libssh_version_header}") set(_libssh_version_header "${LIBSSH_INCLUDE_DIR}/libssh/libssh.h") endif() - + file(STRINGS "${_libssh_version_header}" LIBSSH_VERSION_MAJOR REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+") # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR @@ -91,12 +91,13 @@ else () if(WIN32) set(LIBSSH_DLL_DIR "${LIBSSH_HINTS}/bin" - CACHE PATH "Path to libssh DLL" + CACHE PATH "Path to libssh DLLs" ) - file(GLOB _libssh_dll RELATIVE "${LIBSSH_DLL_DIR}" - "${LIBSSH_DLL_DIR}/libssh.dll" + file(GLOB _libssh_dlls RELATIVE "${LIBSSH_DLL_DIR}" + "${LIBSSH_DLL_DIR}/ssh.dll" + "${LIBSSH_DLL_DIR}/pthreadVC3.dll" ) - set(LIBSSH_DLL ${_libssh_dll} + set(LIBSSH_DLLS ${_libssh_dlls} # We're storing filenames only. Should we use STRING instead? CACHE FILEPATH "libssh DLL file name" ) |