[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble
From: Dennis Nienhüser <earthwings () gentoo ! org>
Date: 2011-03-09 20:30:52
Message-ID: 20110309203052.A1BC8AC8C7 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1224259 by nienhueser:
Add a FindPhonon.cmake check to be able to use phonon from kdesupport. Patch by \
Christoph Feck, thanks! Extended to make phonon an optional dependency and use a null \
audio output when it's missing so that the routing plugin can still be used without \
phonon (no sound output then of course).
CCMAIL: christoph@maxiom.de
CCMAIL: marble-devel@kde.org
A FindPhonon.cmake
M +7 -1 src/plugins/render/routing/CMakeLists.txt
A src/plugins/render/routing/NullAudioOutput.cpp [License: LGPL]
--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/CMakeLists.txt \
#1224258:1224259 @@ -1,5 +1,7 @@
PROJECT(RoutingPlugin)
+FIND_PACKAGE(Phonon)
+
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/src/plugins/render/routing
${CMAKE_BINARY_DIR}/src/plugins/render/routing
@@ -7,9 +9,13 @@
)
INCLUDE(${QT_USE_FILE})
+IF( PHONON_FOUND )
set( routing_SRCS RoutingPlugin.cpp AudioOutput.cpp )
+ELSE()
+ set( routing_SRCS RoutingPlugin.cpp NullAudioOutput.cpp )
+ENDIF()
set( routing_UI RoutingPlugin.ui RoutingConfigDialog.ui )
qt4_wrap_ui( routing_SRCS ${routing_UI} )
marble_add_plugin( RoutingPlugin ${routing_SRCS} )
-target_link_libraries(RoutingPlugin ${QT_PHONON_LIBRARY})
+target_link_libraries(RoutingPlugin ${PHONON_LIBS})
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic