Commit 04739e9f4a10327e3041cd4b2f7ca631a14dab9b
2014-04-30T10:15:44
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a38901..e770142 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)