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
e56e4c76
Commit
e56e4c76
authored
Dec 30, 2016
by
Elliot Saba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMakeLists: Move `http-parser` block down by `zlib`, update error message
parent
236a690c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
CMakeLists.txt
+12
-13
No files found.
CMakeLists.txt
View file @
e56e4c76
...
...
@@ -235,19 +235,6 @@ IF (WIN32 AND EMBED_SSH_PATH)
ADD_DEFINITIONS
(
-DGIT_SSH
)
ENDIF
()
FIND_PACKAGE
(
HTTP_Parser
)
IF
(
HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2
)
INCLUDE_DIRECTORIES
(
${
HTTP_PARSER_INCLUDE_DIRS
}
)
LINK_LIBRARIES
(
${
HTTP_PARSER_LIBRARIES
}
)
LIST
(
APPEND LIBGIT2_PC_LIBS
"-lhttp_parser"
)
ELSE
()
MESSAGE
(
STATUS
"http-parser was not found or is too old; using bundled 3rd-party sources."
)
INCLUDE_DIRECTORIES
(
deps/http-parser
)
FILE
(
GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h
)
ENDIF
()
IF
(
WIN32 AND WINHTTP
)
ADD_DEFINITIONS
(
-DGIT_WINHTTP
)
...
...
@@ -332,6 +319,18 @@ IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
SET
(
SRC_REGEX deps/regex/regex.c
)
ENDIF
()
# Optional external dependency: http-parser
FIND_PACKAGE
(
HTTP_Parser
)
IF
(
HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2
)
INCLUDE_DIRECTORIES
(
${
HTTP_PARSER_INCLUDE_DIRS
}
)
LINK_LIBRARIES
(
${
HTTP_PARSER_LIBRARIES
}
)
LIST
(
APPEND LIBGIT2_PC_LIBS
"-lhttp_parser"
)
ELSE
()
MESSAGE
(
STATUS
"http-parser version 2 was not found; using bundled 3rd-party sources."
)
INCLUDE_DIRECTORIES
(
deps/http-parser
)
FILE
(
GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h
)
ENDIF
()
# Optional external dependency: zlib
FIND_PACKAGE
(
ZLIB
)
IF
(
ZLIB_FOUND
)
...
...
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