From 7302047e9afbcb9598e06e802c66a37ab214efb0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 7 Jul 2018 20:40:38 +0200 Subject: [PATCH] Qt4--: Remove any traces of TOMAHAWK_QT5 --- CMakeLists.txt | 38 ++------ CMakeModules/FindJreen.cmake | 15 +--- CMakeModules/FindLibLastFm.cmake | 10 +-- CMakeModules/FindQtSparkle.cmake | 18 +--- TomahawkUse.cmake.in | 145 +++++++++++++------------------ src/libtomahawk/CMakeLists.txt | 4 +- 6 files changed, 75 insertions(+), 155 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 616db971f..d9289f842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,13 +284,6 @@ if( NOT Qt5Core_DIR ) tomahawk_add_definitions( "-DQ_DECL_OVERRIDE=" ) endif() -if( Qt5Core_DIR ) - set( TOMAHAWK_QT5_TMP TRUE) -else( Qt5Core_DIR ) - set( TOMAHAWK_QT5_TMP FALSE ) -endif( Qt5Core_DIR ) -set( TOMAHAWK_QT5 ${TOMAHAWK_QT5_TMP} CACHE BOOL "Build Tomahawk with Qt5") - if( BUILD_GUI AND UNIX AND NOT APPLE ) macro_optional_find_package( X11 ) macro_log_feature(X11_FOUND "X11" "The Xorg libraries" "http://www.x.org/wiki/" TRUE "" "Xorg libraries are used by libqnetwm to bring windows to front reliably") @@ -318,11 +311,6 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ macro_optional_find_package(Lucene++ 3.0.0) macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection") -if( NOT TOMAHAWK_QT5 ) - macro_optional_find_package(QJSON 0.8.1) - macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances") -ENDIF() - macro_optional_find_package(Taglib 1.8.0) macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files") include( CheckTagLibFileName ) @@ -341,23 +329,15 @@ macro_log_feature(GNUTLS_FOUND "GnuTLS" "http://gnutls.org/" TRUE "" "GnuTLS is needed for serving the Playdar/HTTP API via TLS") -if( TOMAHAWK_QT5 ) - macro_optional_find_package(Qca-qt5) - if(Qca-qt5_DIR) - set(QCA2_FOUND ON CACHE BOOL "QCA2 was found") - set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target") - endif() -else() - macro_optional_find_package(QCA2) +macro_optional_find_package(Qca-qt5) +if(Qca-qt5_DIR) + set(QCA2_FOUND ON CACHE BOOL "QCA2 was found") + set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target") endif() macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "") -if( TOMAHAWK_QT5 ) - macro_optional_find_package(KF5Attica 1.0.0) - set(LIBATTICA_FOUND ${KF5Attica_FOUND}) -else() - macro_optional_find_package(LibAttica 0.4.0) -endif() +macro_optional_find_package(KF5Attica 1.0.0) +set(LIBATTICA_FOUND ${KF5Attica_FOUND}) macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "http://download.kde.org/stable/attica/" TRUE "" "") macro_optional_find_package(QuaZip) @@ -379,11 +359,7 @@ endif() if( UNIX AND NOT APPLE ) macro_optional_find_package(TelepathyQt 0.9.3) - if ( TOMAHAWK_QT5 ) - macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n") - else ( TOMAHAWK_QT5) - macro_log_feature(TelepathyQt4_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n") - endif() + macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n") endif() # we need pthreads too diff --git a/CMakeModules/FindJreen.cmake b/CMakeModules/FindJreen.cmake index d14ca22e1..05fc19b84 100644 --- a/CMakeModules/FindJreen.cmake +++ b/CMakeModules/FindJreen.cmake @@ -6,31 +6,22 @@ # LIBJREEN_FOUND, whether libjreen was found FIND_PACKAGE(PkgConfig QUIET) -if( TOMAHAWK_QT5 ) - set(JREEN_LIB_SUFFIX "-qt5") - set(JREEN_INCLUDE_SUFFIX ${JREEN_LIB_SUFFIX}) -else() - set(JREEN_INCLUDE_SUFFIX "-qt4") -endif() -PKG_CHECK_MODULES(PC_JREEN QUIET libjreen${JREEN_LIB_SUFFIX}) +PKG_CHECK_MODULES(PC_JREEN QUIET libjreen-qt5) FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h HINTS ${PC_JREEN_INCLUDEDIR} ${PC_JREEN_INCLUDE_DIRS} ${CMAKE_INSTALL_INCLUDEDIR} - ${KDE4_INCLUDE_DIR} PATH_SUFFIXES - jreen${JREEN_INCLUDE_SUFFIX} - + jreen-qt5 ) -FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen${JREEN_LIB_SUFFIX} +FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen-qt5 HINTS ${PC_JREEN_LIBDIR} ${PC_JREEN_LIBRARY_DIRS} ${CMAKE_INSTALL_LIBDIR} - ${KDE4_LIB_DIR} ) IF(JREEN_LIBRARIES AND JREEN_INCLUDE_DIR AND NOT PC_JREEN_VERSION) diff --git a/CMakeModules/FindLibLastFm.cmake b/CMakeModules/FindLibLastFm.cmake index a3488350e..6b9442405 100644 --- a/CMakeModules/FindLibLastFm.cmake +++ b/CMakeModules/FindLibLastFm.cmake @@ -7,21 +7,15 @@ # (c) Dominik Schmidt # -if( TOMAHAWK_QT5 ) - set(LASTFM_LIB_SUFFIX "5") -endif() - # Include dir find_path(LIBLASTFM_INCLUDE_DIR # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then - NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h - PATHS ${KDE4_INCLUDE_DIR} + NAMES lastfm5/Track.h ) # Finally the library itself find_library(LIBLASTFM_LIBRARY - NAMES lastfm${LASTFM_LIB_SUFFIX} - PATHS ${KDE4_LIB_DIR} + NAMES lastfm5 ) set(LIBLASTFM_LIBRARIES ${LIBLASTFM_LIBRARY}) diff --git a/CMakeModules/FindQtSparkle.cmake b/CMakeModules/FindQtSparkle.cmake index 8cdee222b..694bd2f9d 100644 --- a/CMakeModules/FindQtSparkle.cmake +++ b/CMakeModules/FindQtSparkle.cmake @@ -5,22 +5,12 @@ # QTSPARKLE_LIBRARY, the path to qtsparkle # QTSPARKLE_FOUND, whether qtsparkle was found -if( TOMAHAWK_QT5 ) - set(QTSPARKLE_SUFFIX "-qt5") -else() - set(QTSPARKLE_SUFFIX "") -endif() - -FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle${QTSPARKLE_SUFFIX}/Updater - HINTS - ${CMAKE_INSTALL_INCLUDEDIR} - ${KDE4_INCLUDE_DIR} +FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle-qt5/Updater + HINTS ${CMAKE_INSTALL_INCLUDEDIR} ) -FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle${QTSPARKLE_SUFFIX} - HINTS - ${CMAKE_INSTALL_LIBDIR} - ${KDE4_LIB_DIR} +FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle-qt5 + HINTS ${CMAKE_INSTALL_LIBDIR} ) INCLUDE(FindPackageHandleStandardArgs) diff --git a/TomahawkUse.cmake.in b/TomahawkUse.cmake.in index 9401e1851..93568839e 100644 --- a/TomahawkUse.cmake.in +++ b/TomahawkUse.cmake.in @@ -1,99 +1,70 @@ #FIXME: this duplicates top level cmakelists: how can we reduce code duplication? -set( TOMAHAWK_QT5 @TOMAHAWK_QT5@ ) +# CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets +find_package(Qt5Core REQUIRED) +find_package(Qt5Concurrent REQUIRED) +find_package(Qt5Svg REQUIRED) +find_package(Qt5UiTools REQUIRED) +find_package(Qt5WebKitWidgets REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Xml REQUIRED) +find_package(Qt5Sql REQUIRED) -if(TOMAHAWK_QT5) - # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets - find_package(Qt5Core REQUIRED) - find_package(Qt5Concurrent REQUIRED) - find_package(Qt5Svg REQUIRED) - find_package(Qt5UiTools REQUIRED) - find_package(Qt5WebKitWidgets REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Xml REQUIRED) - find_package(Qt5Sql REQUIRED) +macro(qt_wrap_ui) + qt5_wrap_ui(${ARGN}) +endmacro() - macro(qt_wrap_ui) - qt5_wrap_ui(${ARGN}) +macro(qt_add_resources) + qt5_add_resources(${ARGN}) +endmacro() + +find_package(Qt5LinguistTools REQUIRED) +macro(qt_add_translation) + qt5_add_translation(${ARGN}) +endmacro() + +if( UNIX AND NOT APPLE ) + # We need this to find the paths to qdbusxml2cpp and co + find_package(Qt5DBus REQUIRED) +endif() + +if(APPLE) + find_package(Qt5MacExtras REQUIRED) +endif() + +if(WIN32) + find_package(Qt5WinExtras REQUIRED) +endif() + +macro(qt_wrap_ui) + qt5_wrap_ui(${ARGN}) +endmacro() + +macro(qt_add_resources) + qt5_add_resources(${ARGN}) +endmacro() + +find_package(Qt5LinguistTools REQUIRED) +macro(qt_add_translation) + qt5_add_translation(${ARGN}) +endmacro() + +if( UNIX AND NOT APPLE ) + macro(qt_add_dbus_interface) + qt5_add_dbus_interface(${ARGN}) endmacro() - macro(qt_add_resources) - qt5_add_resources(${ARGN}) + macro(qt_add_dbus_adaptor) + qt5_add_dbus_adaptor(${ARGN}) endmacro() +endif() - find_package(Qt5LinguistTools REQUIRED) - macro(qt_add_translation) - qt5_add_translation(${ARGN}) - endmacro() - - if( UNIX AND NOT APPLE ) - # We need this to find the paths to qdbusxml2cpp and co - find_package(Qt5DBus REQUIRED) - endif() - - if(APPLE) - find_package(Qt5MacExtras REQUIRED) - endif() - - if(WIN32) - find_package(Qt5WinExtras REQUIRED) - endif() - - macro(qt_wrap_ui) - qt5_wrap_ui(${ARGN}) - endmacro() - - macro(qt_add_resources) - qt5_add_resources(${ARGN}) - endmacro() - - find_package(Qt5LinguistTools REQUIRED) - macro(qt_add_translation) - qt5_add_translation(${ARGN}) - endmacro() - - if( UNIX AND NOT APPLE ) - macro(qt_add_dbus_interface) - qt5_add_dbus_interface(${ARGN}) - endmacro() - - macro(qt_add_dbus_adaptor) - qt5_add_dbus_adaptor(${ARGN}) - endmacro() - endif() - - macro(setup_qt) - endmacro() - - set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") - #FIXME: CrashReporter depends on deprecated QHttp - set(WITH_KDE4 OFF) - -else(TOMAHAWK_QT5) - find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED) - include( ${QT_USE_FILE} ) - - set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork") - if(BUILD_GUI OR NOT DEFINED BUILD_GUI) - list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg") - endif() - - find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS}) - include( ${QT_USE_FILE} ) - - macro(qt_wrap_ui) - qt4_wrap_ui(${ARGN}) - endmacro() - - macro(qt_add_resources) - qt4_add_resources(${ARGN}) - endmacro() - - macro(qt_add_translation) - qt4_add_translation(${ARGN}) - endmacro() -endif(TOMAHAWK_QT5) +macro(setup_qt) +endmacro() +set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") +#FIXME: CrashReporter depends on deprecated QHttp +set(WITH_KDE4 OFF) if(NOT TOMAHAWK_CMAKE_DIR) set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 35e38d8bc..5c818363c 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -422,9 +422,7 @@ IF(LIBATTICA_FOUND) SET( libGuiSources ${libGuiSources} AtticaManager.cpp ) INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} ) LIST(APPEND PRIVATE_LINK_LIBRARIES ${LIBATTICA_LIBRARIES} ${LibAttica_LIBRARIES} ${QUAZIP_LIBRARIES}) - IF( TOMAHAWK_QT5 ) - LIST(APPEND LINK_LIBRARIES KF5::Attica ) - ENDIF( TOMAHAWK_QT5 ) + LIST(APPEND LINK_LIBRARIES KF5::Attica) ENDIF(LIBATTICA_FOUND) if(HAVE_X11)