Skip to content

Commit e56e4c7

Browse files
committed
CMakeLists: Move http-parser block down by zlib, update error message
1 parent 236a690 commit e56e4c7

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

CMakeLists.txt

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -235,19 +235,6 @@ IF (WIN32 AND EMBED_SSH_PATH)
235235
ADD_DEFINITIONS(-DGIT_SSH)
236236
ENDIF()
237237

238-
239-
FIND_PACKAGE(HTTP_Parser)
240-
IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
241-
INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS})
242-
LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES})
243-
LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
244-
ELSE()
245-
MESSAGE(STATUS "http-parser was not found or is too old; using bundled 3rd-party sources.")
246-
INCLUDE_DIRECTORIES(deps/http-parser)
247-
FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
248-
ENDIF()
249-
250-
251238
IF (WIN32 AND WINHTTP)
252239
ADD_DEFINITIONS(-DGIT_WINHTTP)
253240

@@ -332,6 +319,18 @@ IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
332319
SET(SRC_REGEX deps/regex/regex.c)
333320
ENDIF()
334321

322+
# Optional external dependency: http-parser
323+
FIND_PACKAGE(HTTP_Parser)
324+
IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
325+
INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS})
326+
LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES})
327+
LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
328+
ELSE()
329+
MESSAGE(STATUS "http-parser version 2 was not found; using bundled 3rd-party sources.")
330+
INCLUDE_DIRECTORIES(deps/http-parser)
331+
FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
332+
ENDIF()
333+
335334
# Optional external dependency: zlib
336335
FIND_PACKAGE(ZLIB)
337336
IF (ZLIB_FOUND)

0 commit comments

Comments
 (0)