mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Remove obsolete Qt5Core_DIR conditionals

Browse Source
This commit is contained in:
Andreas Sturmlechner
2018-07-07 22:18:27 +02:00
committed by Dominik Schmidt
parent bdc3238e6e
commit be919f74f9
2 changed files with 52 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
CMakeLists.txt
View File

@@ -158,52 +158,48 @@ INCLUDE( MacroLogFeature )
message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" ) message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )
find_package(Qt5Core QUIET) find_package(Qt5Core REQUIRED)
if( Qt5Core_DIR ) find_package(Qt5Concurrent REQUIRED)
# CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets find_package(Qt5Svg REQUIRED)
find_package(Qt5Concurrent REQUIRED) find_package(Qt5UiTools REQUIRED)
find_package(Qt5Svg REQUIRED) find_package(Qt5WebKitWidgets REQUIRED)
find_package(Qt5UiTools REQUIRED) find_package(Qt5Widgets REQUIRED)
find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5Xml REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5X11Extras NO_MODULE QUIET)
find_package(Qt5Xml REQUIRED)
find_package(Qt5X11Extras NO_MODULE QUIET)
if(Qt5X11Extras_FOUND) if(Qt5X11Extras_FOUND)
set(HAVE_X11 TRUE) set(HAVE_X11 TRUE)
else() else()
set(HAVE_X11 FALSE) set(HAVE_X11 FALSE)
endif() endif()
message(STATUS "Found Qt5!") if( UNIX AND NOT APPLE )
if( UNIX AND NOT APPLE )
# We need this to find the paths to qdbusxml2cpp and co # We need this to find the paths to qdbusxml2cpp and co
find_package(Qt5DBus REQUIRED) find_package(Qt5DBus REQUIRED)
endif() endif()
if(APPLE) if(APPLE)
find_package(Qt5MacExtras REQUIRED) find_package(Qt5MacExtras REQUIRED)
endif() endif()
if(WIN32) if(WIN32)
find_package(Qt5WinExtras REQUIRED) find_package(Qt5WinExtras REQUIRED)
endif() endif()
macro(qt_wrap_ui) macro(qt_wrap_ui)
qt5_wrap_ui(${ARGN}) qt5_wrap_ui(${ARGN})
endmacro() endmacro()
macro(qt_add_resources) macro(qt_add_resources)
qt5_add_resources(${ARGN}) qt5_add_resources(${ARGN})
endmacro() endmacro()
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools REQUIRED)
macro(qt_add_translation) macro(qt_add_translation)
qt5_add_translation(${ARGN}) qt5_add_translation(${ARGN})
endmacro() endmacro()
if( UNIX AND NOT APPLE ) if( UNIX AND NOT APPLE )
macro(qt_add_dbus_interface) macro(qt_add_dbus_interface)
qt5_add_dbus_interface(${ARGN}) qt5_add_dbus_interface(${ARGN})
endmacro() endmacro()
@@ -211,19 +207,13 @@ if( Qt5Core_DIR )
macro(qt_add_dbus_adaptor) macro(qt_add_dbus_adaptor)
qt5_add_dbus_adaptor(${ARGN}) qt5_add_dbus_adaptor(${ARGN})
endmacro() endmacro()
endif()
macro(setup_qt)
endmacro()
set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
#FIXME: CrashReporter depends on deprecated QHttp
endif() endif()
if( BUILD_GUI AND UNIX AND NOT APPLE ) macro(setup_qt)
macro_optional_find_package( X11 ) endmacro()
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")
endif() set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
# FIXME: CrashReporter depends on deprecated QHttp
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
check_cxx_compiler_flag( "-std=c++11" CXX11_FOUND ) check_cxx_compiler_flag( "-std=c++11" CXX11_FOUND )

8
src/libtomahawk/CMakeLists.txt
View File

@@ -173,14 +173,6 @@ if(QCA2_FOUND)
set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp ) set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp )
endif() endif()
if(UNIX AND NOT APPLE AND NOT Qt5Core_DIR)
if(BUILD_GUI AND X11_FOUND)
include_directories( ${THIRDPARTY_DIR}/libqnetwm )
list(APPEND libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp)
list(APPEND LINK_LIBRARIES ${X11_LIBRARIES})
endif()
endif()
list(APPEND libSources list(APPEND libSources
TomahawkSettings.cpp TomahawkSettings.cpp
SourceList.cpp SourceList.cpp