diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ option(WITH_IPOD "Enable iPod support in Amarok" ON) option(WITH_MYSQL_EMBEDDED "Build the embedded database library -- highly recommended" ON) option(WITH_PLAYGROUND "Enable building of playground scripts and applets (WARNING: some of them might have legal issues!)" OFF) +option(WITH_QTWEBKIT "Enables the Info, Wikipedia and Upcoming Events (with LastFM) context applets" ON) ############### Taglib set(TAGLIB_MIN_VERSION "1.7") @@ -80,7 +81,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/shared ) -find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED ) +find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED ) +if(WITH_QTWEBKIT) + find_package( Qt4 COMPONENTS QtWebkit REQUIRED) +endif() find_package( KDE4 4.8.4 REQUIRED ) @@ -133,7 +137,11 @@ macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE ${KDE_MIN_VERSION} "" ) - macro_log_feature( QT_QTOPENGL_FOUND "QtOpenGL" "Required for the spectrum analyzer" "http://qt-project.org" FALSE "" "" ) + macro_log_feature( QT_QTOPENGL_FOUND "QtOpenGL" "Required for the spectrum analyzer" "https://www.qt.io/" FALSE "" "" ) + macro_log_feature( WITH_QTWEBKIT "QtWebkit" + "Required for the Info, Wikipedia and Upcoming Events (with LastFM) context applets" + "https://www.qt.io/" FALSE "4.8.3" "" + ) find_package(MySQLAmarok REQUIRED) if( WITH_MYSQL_EMBEDDED ) diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt --- a/src/context/applets/CMakeLists.txt +++ b/src/context/applets/CMakeLists.txt @@ -1,18 +1,23 @@ add_subdirectory( albums ) add_subdirectory( currenttrack ) -add_subdirectory( info ) add_subdirectory( labels ) add_subdirectory( lyrics ) add_subdirectory( photos ) add_subdirectory( tabs ) -add_subdirectory( wikipedia ) if( QT_QTOPENGL_FOUND ) add_subdirectory( analyzer ) endif() +if( WITH_QTWEBKIT ) + add_subdirectory( info ) + add_subdirectory( wikipedia ) +endif() + if( LIBLASTFM_FOUND ) - add_subdirectory( upcomingevents ) + if ( WITH_QTWEBKIT ) + add_subdirectory( upcomingevents ) + endif() add_subdirectory( similarartists ) endif()