[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE/kdebase/runtime/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-11-08 16:47:34
Message-ID: 200811081747.34908.kretz () kde ! org
[Download RAW message or body]

On Saturday 08 November 2008 16:42:01 Sebastian Sauer wrote:
> SVN commit 881618 by sebsauer:
>
> don't break compile if optional alsa is not installed
>
>  M  +4 -2      CMakeLists.txt
>
>
> --- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #881617:881618
> @@ -9,8 +9,9 @@
>  if(KDE4_DISABLE_MULTIMEDIA)
>     message(STATUS "NOTICE: Multimedia support DISABLED
> (KDE4_DISABLE_MULTIMEDIA == ON)") else(KDE4_DISABLE_MULTIMEDIA)
> -   FIND_PACKAGE(Alsa)
> -   ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
> +   FIND_OPTIONAL_PACKAGE(Alsa)
> +   IF(ALSA_FOUND)
> +  
> ALSA_IND_PACKAGE(AlsaCONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa
>.h)
>
>     if(NOT ALSA_FOUND)
>        set(ALSA_INCLUDES "")
> @@ -22,4 +23,5 @@
>     add_subdirectory(tests)
>     add_subdirectory(kcm)
>
> +    ENDIF(ALSA_FOUND)
>  endif(KDE4_DISABLE_MULTIMEDIA)

What was the problem? You just disabled the whole phonon subdir if ALSA isn't 
found...

-- 
________________________________________________________
Matthias Kretz (Germany)                            <><
http://Vir.homelinux.org/
MatthiasKretz@gmx.net, kretz@kde.org,
Matthias.Kretz@urz.uni-heidelberg.de

[prev in list] [next in list] [prev in thread] [next in thread]