Skip to content

Commit 9a7e6a3

Browse files
committed
In the CMake build, show dependency versions in the summary.
* CMakeLists.txt: - Expand the summary with dependency version numbers. - Detect LibreSSL and annotate that in the summary. - The use of Unbound is no longer considered experimental. git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1931217 13f79535-47bb-0310-9956-ffa450edef68
1 parent e4a5613 commit 9a7e6a3

1 file changed

Lines changed: 38 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ if(NOT (OpenSSL_SSL_FOUND AND OpenSSL_Crypto_FOUND))
262262
endif()
263263
else()
264264
set(OpenSSL_FOUND TRUE)
265+
set(OPENSSL_VERSION ${OPENSSL_SSL_VERSION})
265266
set(OPENSSL_INCLUDE_DIR ${OPENSSL_SSL_INCLUDE_DIR})
266267
set(OPENSSL_PC_REQUIRES ${OPENSSL_SSL_PC_REQUIRES} ${OPENSSL_CRYPTO_PC_REQUIRES})
267268
set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
@@ -289,6 +290,7 @@ if(USE_BROTLI)
289290
endif()
290291
else()
291292
set(Brotli_FOUND TRUE)
293+
set(BROTLI_VERSION ${BROTLI_DECODE_VERSION})
292294
set(BROTLI_INCLUDE_DIR ${BROTLI_DECODE_INCLUDE_DIR})
293295
set(BROTLI_PC_REQUIRES ${BROTLI_DECODE_PC_REQUIRES})
294296
endif()
@@ -635,6 +637,15 @@ endif()
635637

636638
if("SERF_HAVE_BROTLI" IN_LIST SERF_C_DEFINES)
637639
set(_have_brotli ON)
640+
if(NOT SERF_WINDOWS)
641+
set(_brotli_version ${BROTLI_VERSION})
642+
else()
643+
# On Windows, vcpkg doesn't install the 'brotli' binary which we use to
644+
# find the version, and it isn't published in the headers. *shrug*
645+
if("${BROTLI_VERSION}" STREQUAL "")
646+
set(_brotli_version "N/A")
647+
endif()
648+
endif()
638649
endif()
639650
if("SERF_HAVE_GSSAPI" IN_LIST SERF_C_DEFINES)
640651
set(_have_gssapi ON)
@@ -643,7 +654,17 @@ if("SERF_HAVE_SSPI" IN_LIST SERF_C_DEFINES)
643654
set(_have_sspi ON)
644655
endif()
645656
if ("SERF_HAVE_UNBOUND=1" IN_LIST SERF_C_DEFINES)
646-
set(_have_unbound "EXPERIMENTAL")
657+
set(_have_unbound ON)
658+
endif()
659+
660+
# Check if we're linking with LibreSSL
661+
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" _libressl_text
662+
REGEX "^ *# *define +LIBRESSL_VERSION_TEXT +\".+$")
663+
if(NOT (_libressl_text STREQUAL ""))
664+
string(REGEX REPLACE "^[^\"]+\"([^\"]+)\".*$" "\\1" _libressl_text ${_libressl_text})
665+
set(_openssl_version ${_libressl_text})
666+
else()
667+
set(_openssl_version ${OPENSSL_VERSION})
647668
endif()
648669

649670
message(STATUS "Summary:")
@@ -662,6 +683,22 @@ message(STATUS " Brotli .................. : ${_have_brotli}")
662683
message(STATUS " GSSAPI .................. : ${_have_gssapi}")
663684
message(STATUS " SSPI .................... : ${_have_sspi}")
664685
message(STATUS " Unbound ................. : ${_have_unbound}")
686+
message(STATUS " Dependencies:")
687+
message(STATUS " APR ..................... : ${APR_VERSION}")
688+
if(APR_VERSION VERSION_LESS 2.0.0)
689+
message(STATUS " APR-Util ................ : ${APRUTIL_VERSION}")
690+
endif()
691+
message(STATUS " OpenSSL ................. : ${_openssl_version}")
692+
message(STATUS " Zlib .................... : ${ZLIB_VERSION}")
693+
if(_have_brotli)
694+
message(STATUS " Brotli .................. : ${_brotli_version}")
695+
endif()
696+
if(_have_gssapi)
697+
message(STATUS " GSSAPI .................. : ${GSSAPI_VERSION}")
698+
endif()
699+
if(_have_unbound)
700+
message(STATUS " Unbound ................. : ${UNBOUND_VERSION}")
701+
endif()
665702
message(STATUS " Install:")
666703
message(STATUS " prefix: ................. : ${CMAKE_INSTALL_PREFIX}")
667704
message(STATUS " headers: ................ : ${SERF_INSTALL_HEADERS}")

0 commit comments

Comments
 (0)