From d0007a2a50c9847bc12e62d244c8239715c2f8cf Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 9 Jul 2007 19:05:26 +0000 Subject: - use libasound to list virtual devices (I'm actually only interested in custom ones defined in e.g. ~/.asoundrc), currently still shows too much - adapt to Solid::AudioInterface change svn path=/trunk/KDE/kdelibs/; revision=685785 --- modules/FindAlsa.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/FindAlsa.cmake b/modules/FindAlsa.cmake index 966841a9..ee63f252 100644 --- a/modules/FindAlsa.cmake +++ b/modules/FindAlsa.cmake @@ -26,16 +26,16 @@ else(HAVE_LIBASOUND2) message(STATUS "ALSA not found") endif(HAVE_LIBASOUND2) set(ALSA_FOUND HAVE_LIBASOUND2) +FIND_PATH(ALSA_INCLUDES alsa/version.h) MACRO(ALSA_VERSION_STRING _result) # check for version in alsa/version.h - FIND_PATH(_ALSA_INCLUDE_DIR alsa/version.h) - IF(_ALSA_INCLUDE_DIR) - FILE(READ "${_ALSA_INCLUDE_DIR}/alsa/version.h" _ALSA_VERSION_CONTENT) + IF(ALSA_INCLUDES) + FILE(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) STRING(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) - ELSE(_ALSA_INCLUDE_DIR) + ELSE(ALSA_INCLUDES) MESSAGE(STATUS "ALSA version not known. ALSA output will probably not work correctly.") - ENDIF(_ALSA_INCLUDE_DIR) + ENDIF(ALSA_INCLUDES) ENDMACRO(ALSA_VERSION_STRING _result) get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) -- cgit v1.2.1