proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-07 01:42:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3261 from libgit2/cmn/link-one-level

Browse Source 
pc: Put libcurl and libssh2 in Libs.private
This commit is contained in:
Carlos Martín Nieto 2015-06-26 16:05:05 +02:00
commit 14888070b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -201,7 +201,7 @@ IF (WIN32 AND WINHTTP)
LINK_LIBRARIES(winhttp rpcrt4 crypt32) LINK_LIBRARIES(winhttp rpcrt4 crypt32)
ELSE () ELSE ()
IF (CURL) IF (CURL)
FIND_PACKAGE(CURL) PKG_CHECK_MODULES(CURL libcurl)
ENDIF () ENDIF ()
IF (NOT AMIGA AND USE_OPENSSL) IF (NOT AMIGA AND USE_OPENSSL)
@ -212,7 +212,7 @@ ELSE ()
ADD_DEFINITIONS(-DGIT_CURL) ADD_DEFINITIONS(-DGIT_CURL)
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
LINK_LIBRARIES(${CURL_LIBRARIES}) LINK_LIBRARIES(${CURL_LIBRARIES})
SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} libcurl") SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${CURL_LDFLAGS}")
ENDIF() ENDIF()
FIND_PACKAGE(HTTP_Parser) FIND_PACKAGE(HTTP_Parser)
@ -280,7 +280,7 @@ IF (LIBSSH2_FOUND)
ADD_DEFINITIONS(-DGIT_SSH) ADD_DEFINITIONS(-DGIT_SSH)
INCLUDE_DIRECTORIES(${LIBSSH2_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${LIBSSH2_INCLUDE_DIRS})
LINK_DIRECTORIES(${LIBSSH2_LIBRARY_DIRS}) LINK_DIRECTORIES(${LIBSSH2_LIBRARY_DIRS})
SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} libssh2") SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${LIBSSH2_LDFLAGS}")
SET(SSH_LIBRARIES ${LIBSSH2_LIBRARIES}) SET(SSH_LIBRARIES ${LIBSSH2_LIBRARIES})
CHECK_LIBRARY_EXISTS("${LIBSSH2_LIBRARIES}" libssh2_userauth_publickey_frommemory "" HAVE_LIBSSH2_MEMORY_CREDENTIALS) CHECK_LIBRARY_EXISTS("${LIBSSH2_LIBRARIES}" libssh2_userauth_publickey_frommemory "" HAVE_LIBSSH2_MEMORY_CREDENTIALS)