Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
14888070
Commit
14888070
authored
Jun 26, 2015
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3261 from libgit2/cmn/link-one-level
pc: Put libcurl and libssh2 in Libs.private
parents
34181825
790cabf0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
+3
-3
No files found.
CMakeLists.txt
View file @
14888070
...
@@ -201,7 +201,7 @@ IF (WIN32 AND WINHTTP)
...
@@ -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 ()
...
@@ -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)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment