Commit 04739e9f by Carlos Martín Nieto

Unquiet CMake output

The point of this phase is to know what we have and not. Show the user a
clear indication of what we have.
parent 892778ee
...@@ -139,7 +139,7 @@ ELSE () ...@@ -139,7 +139,7 @@ ELSE ()
FIND_PACKAGE(OpenSSL) FIND_PACKAGE(OpenSSL)
ENDIF () ENDIF ()
FIND_PACKAGE(HTTP_Parser QUIET) FIND_PACKAGE(HTTP_Parser)
IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2) IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS})
LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES}) LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES})
...@@ -174,9 +174,7 @@ IF(WIN32 OR AMIGA OR ANDROID) ...@@ -174,9 +174,7 @@ IF(WIN32 OR AMIGA OR ANDROID)
ENDIF() ENDIF()
# Optional external dependency: zlib # Optional external dependency: zlib
# It's optional, but FIND_PACKAGE gives a warning that looks more like an FIND_PACKAGE(ZLIB)
# error.
FIND_PACKAGE(ZLIB QUIET)
IF (ZLIB_FOUND) IF (ZLIB_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
LINK_LIBRARIES(${ZLIB_LIBRARIES}) LINK_LIBRARIES(${ZLIB_LIBRARIES})
...@@ -185,8 +183,6 @@ IF (ZLIB_FOUND) ...@@ -185,8 +183,6 @@ IF (ZLIB_FOUND)
ELSE() ELSE()
SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} zlib") SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} zlib")
ENDIF() ENDIF()
# Fake the message CMake would have shown
MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARY}")
ELSE() ELSE()
MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." ) MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." )
INCLUDE_DIRECTORIES(deps/zlib) INCLUDE_DIRECTORIES(deps/zlib)
...@@ -196,7 +192,7 @@ ENDIF() ...@@ -196,7 +192,7 @@ ENDIF()
# Optional external dependency: libssh2 # Optional external dependency: libssh2
IF (USE_SSH AND NOT MINGW) IF (USE_SSH AND NOT MINGW)
FIND_PACKAGE(LIBSSH2 QUIET) FIND_PACKAGE(LIBSSH2)
ENDIF() ENDIF()
IF (LIBSSH2_FOUND) IF (LIBSSH2_FOUND)
ADD_DEFINITIONS(-DGIT_SSH) ADD_DEFINITIONS(-DGIT_SSH)
...@@ -207,7 +203,7 @@ ENDIF() ...@@ -207,7 +203,7 @@ ENDIF()
# Optional external dependency: iconv # Optional external dependency: iconv
IF (USE_ICONV) IF (USE_ICONV)
FIND_PACKAGE(ICONV QUIET) FIND_PACKAGE(ICONV)
ENDIF() ENDIF()
IF (ICONV_FOUND) IF (ICONV_FOUND)
ADD_DEFINITIONS(-DGIT_USE_ICONV) ADD_DEFINITIONS(-DGIT_USE_ICONV)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment