diff options
| author | Guy Harris <gharris@sonic.net> | 2020-07-16 02:03:08 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-07-16 09:26:43 +0000 |
| commit | 92966774721fe914403cebbcbc38ceb7e4c01ea3 (patch) | |
| tree | 255aad427320437ffa65584c02ff0289724c2da2 /cmake | |
| parent | a1d2d18cb8367cc62395be1bbfa9fee6433e4386 (diff) | |
extcap: assume we're using libssh 0.6 or later.
We require 0.6 or later in CMakeLists.txt, and both ssh_version() and
LIBSSH_VERSION having to be fed to SSH_STRINGIFY() date back before 0.5,
so just assume ssh_version() is available and LIBSSH_VERSION has to be
fed to SSH_STRINGIFY().
Change-Id: I4f62a720424383f88e0410cad07dbe67d0c69297
Reviewed-on: https://code.wireshark.org/review/37881
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Guy Harris <gharris@sonic.net>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindLIBSSH.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmake/modules/FindLIBSSH.cmake b/cmake/modules/FindLIBSSH.cmake index 9afec5d7a8..c6f1781516 100644 --- a/cmake/modules/FindLIBSSH.cmake +++ b/cmake/modules/FindLIBSSH.cmake @@ -74,18 +74,6 @@ else () string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH}) set(LIBSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH}) endif() - - # - # Check whether we have ssh_version(), which would let us - # determine the version of libssh at run time. - # - cmake_push_check_state() - set(CMAKE_REQUIRED_INCLUDES ${LIBSSH_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH_LIBRARIES}) - - check_symbol_exists("ssh_version" libssh/libssh.h HAVE_SSH_VERSION) - - cmake_pop_check_state() endif() # handle the QUIETLY and REQUIRED arguments and set LIBSSH_FOUND to TRUE if |