Merge pull request #6053 from stac47/ssh2_discovery · libgit2/libgit2@7d195b9 · GitHub

libgit2 / libgit2 Public

• Notifications You must be signed in to change notification settings
• Fork 2.7k
• Star 10.6k

• Code
• Issues 430
• Pull requests 134
• Discussions
• Actions
• Projects
• Security and quality 11
• Insights

Additional navigation options

Commit 7d195b9

Browse filesBrowse the repository at this point in the historyBrowse files

ethomson

authored

Merge pull request #6053 from stac47/ssh2_discovery

Discover libssh2 without pkg-config

2 parents 646bae3 + 413bfb8 commit 7d195b9
Copy full SHA for 7d195b9

2 files changed

+20Lines changed: 20 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• cmake
  • FindLibSSH2.cmake
• src
  • CMakeLists.txt

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎cmake/FindLibSSH2.cmake‎

Copy file name to clipboard

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,13 @@
	1	+ # LIBSSH2_FOUND - system has the libssh2 library
	2	+ # LIBSSH2_INCLUDE_DIR - the libssh2 include directory
	3	+ # LIBSSH2_LIBRARY - the libssh2 library name
	4	+
	5	+ FIND_PATH(LIBSSH2_INCLUDE_DIR libssh2.h)
	6	+
	7	+ FIND_LIBRARY(LIBSSH2_LIBRARY NAMES ssh2 libssh2)
	8	+
	9	+ INCLUDE(FindPackageHandleStandardArgs)
	10	+ find_package_handle_standard_args(LibSSH2
	11	+ REQUIRED_VARS LIBSSH2_LIBRARY LIBSSH2_INCLUDE_DIR)
	12	+
	13	+ MARK_AS_ADVANCED(LIBSSH2_INCLUDE_DIR LIBSSH2_LIBRARY)

Collapse file

‎src/CMakeLists.txt‎

Copy file name to clipboardExpand all lines: src/CMakeLists.txt

+7Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -232,6 +232,13 @@ ENDIF()
232	232	# Optional external dependency: libssh2
233	233	IF (USE_SSH)
234	234	FIND_PKGLIBRARIES(LIBSSH2 libssh2)
	235	+ IF (NOT LIBSSH2_FOUND)
	236	+ FIND_PACKAGE(LibSSH2)
	237	+ SET(LIBSSH2_INCLUDE_DIRS ${LIBSSH2_INCLUDE_DIR})
	238	+ GET_FILENAME_COMPONENT(LIBSSH2_LIBRARY_DIRS "${LIBSSH2_LIBRARY}" DIRECTORY)
	239	+ SET(LIBSSH2_LIBRARIES ${LIBSSH2_LIBRARY})
	240	+ SET(LIBSSH2_LDFLAGS "-lssh2")
	241	+ ENDIF()
235	242	ENDIF()
236	243	IF (LIBSSH2_FOUND)
237	244	SET(GIT_SSH 1)

0 commit comments

Comments

0 (0)