diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2019-01-28 20:02:34 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2019-01-29 15:03:25 +0000 |
| commit | 1260f3edea433338e244f19b560f2410d6c17021 (patch) | |
| tree | 579f09dd32131c6ee69c17a3cfc85da7af3226a2 | |
| parent | ab13515315a4263eb86dbc6e4b0e55bbbc862244 (diff) | |
CMake: Minor standard output improvements
Change-Id: I7677220ec49d7b04f61e2a7287dac3a744f1c6c6
Reviewed-on: https://code.wireshark.org/review/31786
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
| -rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89ef52d45c..a9482b3a97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,10 +135,7 @@ if( NOT CMAKE_BUILD_TYPE ) "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) endif() -message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}") -string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type) -message(STATUS "CMAKE_C_FLAGS_${_build_type}: ${CMAKE_C_FLAGS_${_build_type}}") -message(STATUS "CMAKE_CXX_FLAGS_${_build_type}: ${CMAKE_CXX_FLAGS_${_build_type}}") +message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}") # Ensure that all executables and libraries end up in the same directory. Actual # files might end up in a configuration subdirectory, e.g. run/Debug or @@ -1048,10 +1045,6 @@ ws_find_package(KERBEROS ENABLE_KERBEROS HAVE_KERBEROS) # C Asynchronous resolver ws_find_package(CARES ENABLE_CARES HAVE_C_ARES "1.5.0") -if(NOT CARES_FOUND) - message(WARNING "Not using c-ares.") - message(WARNING "DNS name resolution for captures will be disabled.") -endif() # Zlib compression if(ENABLE_ZLIB) @@ -1475,10 +1468,20 @@ set_package_properties(NGHTTP2 PROPERTIES URL "https://nghttp2.org" PURPOSE "Header decompression in HTTP2" ) +set_package_properties(CARES PROPERTIES + DESCRIPTION "Library for asynchronous DNS requests" + URL "https://c-ares.haxx.se/" + PURPOSE "DNS name resolution for captures" +) -message(STATUS "C-Flags: ${CMAKE_C_FLAGS}") -message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS}") -message(STATUS "Warnings as errors: ${WERROR_COMMON_FLAGS}") +string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type) +message(STATUS "C-Flags: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${_build_type}}") +message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${_build_type}}") +if(WERROR_COMMON_FLAGS) + message(STATUS "Warnings as errors enabled: ${WERROR_COMMON_FLAGS}") +else() + message(STATUS "Warnings as errors disabled") +endif() feature_summary(WHAT ALL) |