SVN commit 983646 by winterz: fix up some macro logging messages M +1 -1 CMakeLists.txt M +1 -1 kded-module/CMakeLists.txt M +1 -1 libkaudiodevicelist/CMakeLists.txt --- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #983645:983646 @@ -11,7 +11,7 @@ else(KDE4_DISABLE_MULTIMEDIA) set(PHONON_MIN_VERSION "4.2.96") macro_ensure_version("${PHONON_MIN_VERSION}" "${PHONON_VERSION}" _phonon_version_ok) - macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" "svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}") + macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" "svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}" "STRONGLY RECOMMENDED: Required for playing audio and video throughout KDE") FIND_PACKAGE(Alsa) ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) --- trunk/KDE/kdebase/runtime/phonon/kded-module/CMakeLists.txt #983645:983646 @@ -10,7 +10,7 @@ #endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") macro_optional_find_package(PulseAudio) -macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "libpulse is needed to allow audio playback via the PulseAudio soundserver when it is running" "http://www.pulseaudio.org/" FALSE) +macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "A cross-platform, networked sound server." "http://www.pulseaudio.org" FALSE "" "Allows audio playback via the PulseAudio soundserver when it is running") if(PULSEAUDIO_FOUND) add_definitions(-DHAVE_PULSEAUDIO) --- trunk/KDE/kdebase/runtime/phonon/libkaudiodevicelist/CMakeLists.txt #983645:983646 @@ -7,7 +7,7 @@ ENDIF(ALSA_VERSION_STR MATCHES "^1\\.(0\\.(1[4-9]|[2-9][0-9]+)|[1-9][0-9]*\\.)") ENDIF(ALSA_VERSION_STR AND NOT WIN32) if(NOT WIN32) - macro_log_feature(HAVE_CURRENT_ALSA "ALSA" "current alsa-lib is needed for dmix and virtual device listing" "http://www.alsa-project.org/" FALSE "1.0.14a") + macro_log_feature(HAVE_CURRENT_ALSA "ALSA" "The Advanced Linux Sound Architecture (ALSA) library" "http://www.alsa-project.org/" FALSE "1.0.14a" "A current ALSA library is needed for dmix and virtual device listing") endif(NOT WIN32) include_directories(${ALSA_INCLUDES})