D11700: Mark Phonon as a required module in CMake
A. Wilcox
noreply at phabricator.kde.org
Sun Mar 25 20:29:52 UTC 2018
awilcox created this revision.
awilcox added a reviewer: aacid.
awilcox added a project: KDE Edu.
Restricted Application added a subscriber: KDE Edu.
awilcox requested review of this revision.
REVISION SUMMARY
Right now, Blinken does not require Phonon in CMake:
-- The following OPTIONAL packages have not been found:
* Phonon4Qt5
-- Configuring done
-- Generating done
-- Build files have been written to: /usr/src/packages/user/blinken/src/blinken-17.12.2
However, this results in a build failure:
[ 76%] Building CXX object src/CMakeFiles/blinken.dir/main.cpp.o
In file included from /usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.cpp:10:0:
/usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.h:13:30: fatal error: phonon/MediaObject: No such file or directory
#include <phonon/MediaObject>
^
compilation terminated.
make[2]: *** [src/CMakeFiles/blinken.dir/build.make:119: src/CMakeFiles/blinken.dir/soundsplayer.cpp.o] Error 1
make[2]: *** Waiting for unfinished jobs....
[ 76%] Built target doc-index-cache-bz2
In file included from /usr/src/packages/user/blinken/src/blinken-17.12.2/src/blinkengame.cpp:17:0:
/usr/src/packages/user/blinken/src/blinken-17.12.2/src/soundsplayer.h:13:30: fatal error: phonon/MediaObject: No such file or directory
#include <phonon/MediaObject>
^
compilation terminated.
make[2]: *** [src/CMakeFiles/blinken.dir/build.make:143: src/CMakeFiles/blinken.dir/blinkengame.cpp.o] Error 1
This patch forces Phonon to be required.
TEST PLAN
Tested on git master and 17.12.2 release tarballs on Linux. Since this is an unconditional header I cannot see this requiring testing on other platforms; the behaviour should be the same.
REPOSITORY
R324 Blinken
REVISION DETAIL
https://phabricator.kde.org/D11700
AFFECTED FILES
CMakeLists.txt
To: awilcox, aacid
Cc: kde-edu, #kde_edu, narvaez, apol
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20180325/67709e17/attachment.html>
More information about the kde-edu
mailing list