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

List:       kde-commits
Subject:    [calligra] /: Link to Phonon using the imported target
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2016-12-10 13:12:29
Message-ID: E1cFhS1-0006Qf-JN () code ! kde ! org
[Download RAW message or body]

Git commit f8af2bbe17b2c1b1107241c300daaee2766b9376 by Friedrich W. H. Kossebau.
Committed on 10/12/2016 at 13:12.
Pushed by kossebau into branch 'master'.

Link to Phonon using the imported target

M  +9    -2    plugins/videoshape/CMakeLists.txt
M  +2    -7    stage/plugins/eventactions/CMakeLists.txt

https://commits.kde.org/calligra/f8af2bbe17b2c1b1107241c300daaee2766b9376

diff --git a/plugins/videoshape/CMakeLists.txt b/plugins/videoshape/CMakeLists.txt
index 732b30f70b5..d40dbf17c82 100644
--- a/plugins/videoshape/CMakeLists.txt
+++ b/plugins/videoshape/CMakeLists.txt
@@ -3,7 +3,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"calligra_shape_video\")
 include_directories(
     ${FLAKE_INCLUDES}
     ${KOWIDGETS_INCLUDES}
-    ${PHONON_INCLUDES}
 )
 
 if(PHONON_FOUND_EXPERIMENTAL)
@@ -40,6 +39,14 @@ ki18n_wrap_ui(videoshape_LIB_SRCS forms/VideoToolWidget.ui)
 add_library(calligra_shape_video MODULE ${videoshape_LIB_SRCS})
 calligra_shape_desktop_to_json(calligra_shape_video calligra_shape_video.desktop)
 
-target_link_libraries(calligra_shape_video flake kowidgets KF5::KIOFileWidgets \
${PHONON_LIBS}) +target_link_libraries(calligra_shape_video
+    flake
+    kowidgets
+    KF5::KIOFileWidgets
+    Phonon::phonon4qt5
+)
+if(PHONON_FOUND_EXPERIMENTAL)
+    target_link_libraries(calligra_shape_video Phonon::phonon4qt5experimental)
+endif()
 
 install(TARGETS calligra_shape_video DESTINATION \
                ${PLUGIN_INSTALL_DIR}/calligra/shapes)
diff --git a/stage/plugins/eventactions/CMakeLists.txt \
b/stage/plugins/eventactions/CMakeLists.txt index fbae16c164a..626e43cd8cc 100644
--- a/stage/plugins/eventactions/CMakeLists.txt
+++ b/stage/plugins/eventactions/CMakeLists.txt
@@ -1,9 +1,4 @@
 include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  \
                ${CMAKE_SOURCE_DIR}/stage/part)
-if(NOT QT_MAC_USE_COCOA)
-    include_directories(${PHONON_INCLUDE_DIR}/phonon)
-else()
-    include_directories(${PHONON_INCLUDE_DIR})
-endif()
 
 set(calligrastageeventactions_PART_SRCS
     sound/KPrSoundEventAction.cpp
@@ -21,8 +16,8 @@ target_link_libraries(
     calligrastageprivate
     flake
     KF5::KIOCore
-    ${PHONON_LIBS}
+    Phonon::phonon4qt5
     Qt5::Gui
-    )
+)
 
 install(TARGETS calligrastageeventactions  DESTINATION \
${PLUGIN_INSTALL_DIR}/calligra/presentationeventactions)


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