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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-05-26 21:44:03
Message-ID: 1211838243.583871.9453.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 813050 by mkretz:

make libkaudiodevicelist variable work in here again

 M  +6 -0      CMakeLists.txt  
 M  +1 -6      libkaudiodevicelist/CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #813049:813050
@@ -20,6 +20,12 @@
    FIND_PACKAGE(Alsa)
    ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
 
+   if(NOT ALSA_FOUND)
+      set(ALSA_INCLUDES "")
+      set(ASOUND_LIBRARY "")
+   endif(NOT ALSA_FOUND)
+   set(KDE4_KAUDIODEVICELIST_LIBS kaudiodevicelist ${KDE4_SOLID_LIBS} \
${KDE4_PHONON_LIBS} ${KDE4_KDECORE_LIBS} ${ASOUND_LIBRARY}) +
    add_subdirectory(libkaudiodevicelist)
    add_subdirectory(platform_kde)
    add_subdirectory(tests)
--- trunk/KDE/kdebase/runtime/phonon/libkaudiodevicelist/CMakeLists.txt \
#813049:813050 @@ -10,11 +10,6 @@
    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")  \
endif(NOT WIN32)  
-if(NOT ALSA_FOUND)
-   set(ALSA_INCLUDES "")
-   set(ASOUND_LIBRARY "")
-endif(NOT ALSA_FOUND)
-
 include_directories(${CMAKE_SOURCE_DIR}/solid ${CMAKE_BINARY_DIR}/solid \
${ALSA_INCLUDES})  
 set(kaudiodevicelist_LIB_SRCS
@@ -28,7 +23,7 @@
 endif(ALSA_FOUND)
 
 kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
-target_link_libraries(kaudiodevicelist ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} \
${KDE4_KDECORE_LIBS} ${ASOUND_LIBRARY}) \
+target_link_libraries(${KDE4_KAUDIODEVICELIST_LIBS})  
 set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION})  


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