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

List:       kde-commits
Subject:    [calligra/frameworks] /: Only disable Stage eventactions if Phonon4Qt5 is not found
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 19:48:14
Message-ID: E1Yd290-0003TP-9e () scm ! kde ! org
[Download RAW message or body]

Git commit 3f0d60443606c22a11e2ff3c92c32c66e5544a2d by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 19:46.
Pushed by kossebau into branch 'frameworks'.

Only disable Stage eventactions if Phonon4Qt5 is not found

M  +1    -2    CMakeLists.txt
M  +3    -1    stage/plugins/CMakeLists.txt

http://commits.kde.org/calligra/3f0d60443606c22a11e2ff3c92c32c66e5544a2d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0e1490..43d5dc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,7 +318,7 @@ configure_file(config-gsl.h.cmake ${CMAKE_CURRENT_BINAR=
Y_DIR}/config-gsl.h )
 ## Test for Phonon4Qt5
 ##
 find_package(Phonon4Qt5)
-macro_log_feature(Phonon4Qt5_FOUND "Phonon4Qt5" "Abstraction lib for multi=
media applications" "http://www.kde.org/" FALSE "" "Required by Stage and V=
ideoshape plugin")
+macro_log_feature(Phonon4Qt5_FOUND "Phonon4Qt5" "Abstraction lib for multi=
media applications" "http://www.kde.org/" FALSE "" "Required by Stage event=
 actions and Videoshape plugin")
 =

 ##
 ## Test for KF5CalendarCore
@@ -843,7 +843,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF
 =

 calligra_drop_product_on_bad_condition( PART_STAGE
     Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found"
-    Phonon4Qt5_FOUND "Phonon4Qt5 devel not found"
 )
 =

 calligra_drop_product_on_bad_condition( PART_SHEETS
diff --git a/stage/plugins/CMakeLists.txt b/stage/plugins/CMakeLists.txt
index 5b619ff..638607f 100644
--- a/stage/plugins/CMakeLists.txt
+++ b/stage/plugins/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory( eventactions )
+if(Phonon4Qt5_FOUND)
+    add_subdirectory( eventactions )
+endif()
 add_subdirectory( pageeffects )
 add_subdirectory( shapeanimations )
 if(NOT WIN32) ## Disable in Windows for now
[prev in list] [next in list] [prev in thread] [next in thread]