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

List:       kde-commits
Subject:    [kphotoalbum/kf5-port] /: WIP: Link against Phonon4Qt5.
From:       Johannes Zarl-Zierl <johannes () zarl-zierl ! at>
Date:       2016-04-16 0:16:50
Message-ID: E1arDus-0001WV-Uc () scm ! kde ! org
[Download RAW message or body]

Git commit f36697692bad564a5f6c6a83849fa6a088028ee7 by Johannes Zarl-Zierl.
Committed on 16/04/2016 at 00:14.
Pushed by johanneszarl into branch 'kf5-port'.

WIP: Link against Phonon4Qt5.

M  +2    -4    CMakeLists.txt

http://commits.kde.org/kphotoalbum/f36697692bad564a5f6c6a83849fa6a088028ee7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c827f1e..0802991 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,7 @@ include(KDECMakeSettings)
 include(FeatureSummary)
 =

 find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
-# 2016-02-21 TODO ZaJ: libphonon5qt5-dev is currently dysfunctional in Deb=
ian/sid -> ignore for now
-#find_package(Phonon4Qt5 REQUIRED)
+find_package(Phonon4Qt5 REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO WidgetsAddons Con=
fig IconThemes KDELibs4Support Archive Parts)
 =

 # enable exceptions:
@@ -449,10 +448,9 @@ add_executable(kphotoalbum ${kphotoalbum_SRCS})
 target_link_libraries(kphotoalbum ${JPEG_LIBRARY})
 target_link_libraries(kphotoalbum Qt5::Network)
 target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::Widget=
sAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archi=
ve KF5::Parts)
+target_link_libraries(kphotoalbum Phonon::phonon4qt5)
 # for now:
 target_link_libraries(kphotoalbum KF5::KDELibs4Support)
-# 2016-02-21 TODO ZaJ: see above why this is disabled:
-#target_link_libraries(photoalbum PhononQt5)
 =

 if(KF5Kipi_FOUND)
     target_link_libraries(kphotoalbum KF5::Kipi)
[prev in list] [next in list] [prev in thread] [next in thread]