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
c1770aeb
Commit
c1770aeb
authored
9 years ago
by
Edward Thomson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3410 from libgit2/cmn/ssh-embed-again
Revert "Get rid of libssh2 embedding"
parents
6d6020de
01fe8374
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
CMakeLists.txt
+13
-2
No files found.
CMakeLists.txt
View file @
c1770aeb
...
...
@@ -59,6 +59,10 @@ IF(MSVC)
# are linking statically
OPTION
(
STATIC_CRT
"Link the static CRT libraries"
ON
)
# If you want to embed a copy of libssh2 into libgit2, pass a
# path to libssh2
OPTION
(
EMBED_SSH_PATH
"Path to libssh2 to embed (Windows)"
OFF
)
ADD_DEFINITIONS
(
-D_SCL_SECURE_NO_WARNINGS
)
ADD_DEFINITIONS
(
-D_CRT_SECURE_NO_DEPRECATE
)
ADD_DEFINITIONS
(
-D_CRT_NONSTDC_NO_DEPRECATE
)
...
...
@@ -172,6 +176,13 @@ IF (COREFOUNDATION_FOUND)
ENDIF
()
IF
(
WIN32 AND EMBED_SSH_PATH
)
FILE
(
GLOB SRC_SSH
"
${
EMBED_SSH_PATH
}
/src/*.c"
)
INCLUDE_DIRECTORIES
(
"
${
EMBED_SSH_PATH
}
/include"
)
FILE
(
WRITE
"
${
EMBED_SSH_PATH
}
/src/libssh2_config.h"
"#define HAVE_WINCNG
\n
#define LIBSSH2_WINCNG
\n
#include
\"
../win32/libssh2_config.h
\"
"
)
ADD_DEFINITIONS
(
-DGIT_SSH
)
ENDIF
()
IF
(
WIN32 AND WINHTTP
)
ADD_DEFINITIONS
(
-DGIT_WINHTTP
)
INCLUDE_DIRECTORIES
(
deps/http-parser
)
...
...
@@ -501,7 +512,7 @@ ELSE()
ENDIF
()
# Compile and link libgit2
ADD_LIBRARY
(
git2
${
SRC_H
}
${
SRC_GIT2
}
${
SRC_OS
}
${
SRC_ZLIB
}
${
SRC_HTTP
}
${
SRC_REGEX
}
${
SRC_SHA1
}
${
WIN_RC
}
)
ADD_LIBRARY
(
git2
${
SRC_H
}
${
SRC_GIT2
}
${
SRC_OS
}
${
SRC_ZLIB
}
${
SRC_HTTP
}
${
SRC_REGEX
}
${
SRC_S
SH
}
${
SRC_S
HA1
}
${
WIN_RC
}
)
TARGET_LINK_LIBRARIES
(
git2
${
SECURITY_DIRS
}
)
TARGET_LINK_LIBRARIES
(
git2
${
COREFOUNDATION_DIRS
}
)
TARGET_LINK_LIBRARIES
(
git2
${
SSL_LIBRARIES
}
)
...
...
@@ -571,7 +582,7 @@ IF (BUILD_CLAR)
${
CLAR_PATH
}
/clar.c
PROPERTIES OBJECT_DEPENDS
${
CLAR_PATH
}
/clar.suite)
ADD_EXECUTABLE(libgit2_clar
${
SRC_H
}
${
SRC_GIT2
}
${
SRC_OS
}
${
SRC_CLAR
}
${
SRC_TEST
}
${
SRC_ZLIB
}
${
SRC_HTTP
}
${
SRC_REGEX
}
${
SRC_SHA1
}
)
ADD_EXECUTABLE(libgit2_clar
${
SRC_H
}
${
SRC_GIT2
}
${
SRC_OS
}
${
SRC_CLAR
}
${
SRC_TEST
}
${
SRC_ZLIB
}
${
SRC_HTTP
}
${
SRC_REGEX
}
${
SRC_S
SH
}
${
SRC_S
HA1
}
)
TARGET_LINK_LIBRARIES(libgit2_clar
${
COREFOUNDATION_DIRS
}
)
TARGET_LINK_LIBRARIES(libgit2_clar
${
SECURITY_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
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