From 04739e9f4a10327e3041cd4b2f7ca631a14dab9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Wed, 30 Apr 2014 10:15:44 +0200 Subject: 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. --- CMakeLists.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a3890152..e7701429c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ ELSE () FIND_PACKAGE(OpenSSL) ENDIF () - FIND_PACKAGE(HTTP_Parser QUIET) + 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}) @@ -174,9 +174,7 @@ IF(WIN32 OR AMIGA OR ANDROID) ENDIF() # Optional external dependency: zlib -# It's optional, but FIND_PACKAGE gives a warning that looks more like an -# error. -FIND_PACKAGE(ZLIB QUIET) +FIND_PACKAGE(ZLIB) IF (ZLIB_FOUND) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) LINK_LIBRARIES(${ZLIB_LIBRARIES}) @@ -185,8 +183,6 @@ IF (ZLIB_FOUND) ELSE() SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} zlib") ENDIF() - # Fake the message CMake would have shown - MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARY}") ELSE() MESSAGE(STATUS "zlib was not found; using bundled 3rd-party sources." ) INCLUDE_DIRECTORIES(deps/zlib) @@ -196,7 +192,7 @@ ENDIF() # Optional external dependency: libssh2 IF (USE_SSH AND NOT MINGW) - FIND_PACKAGE(LIBSSH2 QUIET) + FIND_PACKAGE(LIBSSH2) ENDIF() IF (LIBSSH2_FOUND) ADD_DEFINITIONS(-DGIT_SSH) @@ -207,7 +203,7 @@ ENDIF() # Optional external dependency: iconv IF (USE_ICONV) - FIND_PACKAGE(ICONV QUIET) + FIND_PACKAGE(ICONV) ENDIF() IF (ICONV_FOUND) ADD_DEFINITIONS(-DGIT_USE_ICONV) -- cgit v1.2.1