mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 17:43:59 +02:00
Code Issues Releases Wiki Activity

Add QtWebKit as required dependency for Qt>5.6, fix cmake configuration errors on OSX

Browse Source
This commit is contained in:
Hugo Lindström
2019-12-08 16:03:58 +08:00
parent 299f033ef9
commit 18b42539e4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -77,7 +77,7 @@ You can download one of our nightly or stable builds:
Required dependencies: Required dependencies:
* [CMake 3](http://www.cmake.org/) * [CMake 3](http://www.cmake.org/)
* [Qt 5.4.0](http://qt-project.org/) * [Qt >= 5.4.0](http://qt-project.org/)
* [VLC 2.1.0](https://videolan.org/vlc/) * [VLC 2.1.0](https://videolan.org/vlc/)
* [SQLite 3.6.22](http://www.sqlite.org/) * [SQLite 3.6.22](http://www.sqlite.org/)
* [TagLib 1.8](https://taglib.github.io/) * [TagLib 1.8](https://taglib.github.io/)
@@ -90,6 +90,10 @@ Required dependencies:
* [Sparsehash](https://code.google.com/p/sparsehash/) * [Sparsehash](https://code.google.com/p/sparsehash/)
* [GnuTLS](http://gnutls.org/) * [GnuTLS](http://gnutls.org/)
If you are using Qt>5.6 you need to build and install QtWebKit
* [QtWebKit](https://github.com/qt/qtwebkit)
The following dependencies are optional (but *recommended*): The following dependencies are optional (but *recommended*):
* [Jreen 1.1.1](http://qutim.org/jreen/) * [Jreen 1.1.1](http://qutim.org/jreen/)

2
src/libtomahawk/CMakeLists.txt
View File

@@ -494,7 +494,7 @@ target_link_libraries(${TOMAHAWK_LIBRARY} PUBLIC
Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg
) )
if(APPLE) if(APPLE)
target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::MacExtras) target_link_libraries(${TOMAHAWK_LIBRARY} PRIVATE Qt5::MacExtras)
endif() endif()
IF(QCA2_FOUND) IF(QCA2_FOUND)

4
src/tomahawk/CMakeLists.txt
View File

@@ -146,9 +146,7 @@ ENDIF()
file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" ) file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )
if(APPLE) if(APPLE)
# OUTFILE is currently only supported in my branch, see https://git.reviewboard.kde.org/r/126303/ ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} SIDEBAR_ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}")
# once merged (and released), we can remove this conditional usage
ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}")
else() else()
ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS}) ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS})
endif() endif()