Commit 4f91bfa32b33c729b7370d3da89fa2141faaac9b
2014-12-05T10:32:59
Find libssh2 via pkg-config We don't really need our own module to find libssh2. Using pkg-config lets the standard tool do the work for us and let us fit more naturally in the workflow as we respect the pkg-config search paths.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89dce45..c06026b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ ENDIF()
# Optional external dependency: libssh2
IF (USE_SSH)
- FIND_PACKAGE(LIBSSH2)
+ PKG_CHECK_MODULES(LIBSSH2 libssh2)
ENDIF()
IF (LIBSSH2_FOUND)
ADD_DEFINITIONS(-DGIT_SSH)
diff --git a/cmake/Modules/FindLIBSSH2.cmake b/cmake/Modules/FindLIBSSH2.cmake
deleted file mode 100644
index 6347d60..0000000
--- a/cmake/Modules/FindLIBSSH2.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-if (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
- set(LIBSSH2_FOUND TRUE)
-else (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
- find_path(LIBSSH2_INCLUDE_DIR
- NAMES
- libssh2.h
- PATHS
- /usr/include
- /usr/local/include
- /opt/local/include
- /sw/include
- ${CMAKE_INCLUDE_PATH}
- ${CMAKE_INSTALL_PREFIX}/include
- )
-
- find_library(LIBSSH2_LIBRARY
- NAMES
- ssh2
- libssh2
- PATHS
- /usr/lib
- /usr/local/lib
- /opt/local/lib
- /sw/lib
- ${CMAKE_LIBRARY_PATH}
- ${CMAKE_INSTALL_PREFIX}/lib
- )
-
- if (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
- set(LIBSSH2_FOUND TRUE)
- endif (LIBSSH2_INCLUDE_DIR AND LIBSSH2_LIBRARY)
-
- if (LIBSSH2_FOUND)
- set(LIBSSH2_INCLUDE_DIRS
- ${LIBSSH2_INCLUDE_DIR}
- )
-
- set(LIBSSH2_LIBRARIES
- ${LIBSSH2_LIBRARIES}
- ${LIBSSH2_LIBRARY}
- )
- endif (LIBSSH2_FOUND)
-endif (LIBSSH2_LIBRARIES AND LIBSSH2_INCLUDE_DIRS)
-