From 0556a7dfc42ef255ad8779ee3d273de088542f70 Mon Sep 17 00:00:00 2001 From: Kaian Date: Mon, 8 Apr 2019 21:44:34 +0200 Subject: [PATCH] cmake: display configure flags in summary --- CMakeLists.txt | 18 ++++++++++-------- src/config.h.cmake | 17 ++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e32bb8d..7dc1332 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,12 @@ endif () include(GNUInstallDirs) include_directories(${CMAKE_SOURCE_DIR}/src) +include_directories(${CMAKE_SOURCE_DIR}/src/glib) include_directories(${CMAKE_SOURCE_DIR}/src/ncurses) include_directories(${CMAKE_SOURCE_DIR}/src/ncurses/windows) include_directories(${CMAKE_SOURCE_DIR}/src/capture/) -include_directories(${CMAKE_SOURCE_DIR}/src/capture/packet) +include_directories(${CMAKE_SOURCE_DIR}/src/capture/dissectors) +include_directories(${CMAKE_SOURCE_DIR}/src/capture/codecs) set(SOURCES src/capture/address.c @@ -80,7 +82,7 @@ endif (USE_HEP) option(USE_IPV6 "Enable IPv6 Support" ON) # GnuTLS Support -option(WITH_SSL "Enable SSL Support (TLS SIP Transport)" OFF) +option(WITH_SSL "Enable SSL Support (TLS SIP Transport)" ON) if (WITH_SSL) set(SOURCES ${SOURCES} src/capture/dissectors/packet_tls.c) endif (WITH_SSL) @@ -181,11 +183,11 @@ endif (DISPLAY_LOGO) message(" ") message(" sngrep configure finished ") message(" ====================================================== ") -message(" SND Support : ${WITH_SND} ") -message(" SSL Support : ${WITH_SSL} ") -message(" Pulseaudio Support : ${WITH_PULSE} ") -message(" g729 Support : ${WITH_G729} ") -message(" HEP Support : ${USE_HEP} ") -message(" IPv6 Support : ${USE_IPV6} ") +message(" SND Support (WITH_SND) : ${WITH_SND} ") +message(" SSL Support (WITH_SSL) : ${WITH_SSL} ") +message(" Pulseaudio Support (WITH_PULSE) : ${WITH_PULSE} ") +message(" g729 Support (WITH_G729) : ${WITH_G729} ") +message(" HEP Support (USE_HEP) : ${USE_HEP} ") +message(" IPv6 Support (USE_IPV6) : ${USE_IPV6} ") message(" ====================================================== ") message(" ") diff --git a/src/config.h.cmake b/src/config.h.cmake index 49a579f..b3605fb 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -25,22 +25,17 @@ #define PACKAGE "@PROJECT_NAME@" #define VERSION "@PROJECT_VERSION@" -#cmakedefine PROJECT_NAME -#cmakedefine PROJECT_VERSION -#cmakedefine PROJECT_VERSION_MAJOR -#cmakedefine PROJECT_VERSION_MINOR -#cmakedefine PROJECT_VERSION_PATCH - +/** Defined if HEP support is enabled **/ #cmakedefine USE_HEP - +/** Defined if IPv6 support is enabled **/ #cmakedefine USE_IPV6 - +/** Defined if TLS packet support is enabled **/ #cmakedefine WITH_SSL - +/** Defined if Save to WAV support is enabled **/ #cmakedefine WITH_SND - +/** Defined if RTP Playback support is enabled **/ #cmakedefine WITH_PULSE - +/** Defined if G729A decode support is enabled **/ #cmakedefine WITH_G729 #endif