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

12
CMakeLists.txt
View File

@@ -158,9 +158,7 @@ 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 )
# CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
find_package(Qt5Concurrent REQUIRED) find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Svg REQUIRED) find_package(Qt5Svg REQUIRED)
find_package(Qt5UiTools REQUIRED) find_package(Qt5UiTools REQUIRED)
@@ -175,8 +173,6 @@ if( Qt5Core_DIR )
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)
@@ -218,12 +214,6 @@ if( Qt5Core_DIR )
set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}") set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
# FIXME: CrashReporter depends on deprecated QHttp # FIXME: CrashReporter depends on deprecated QHttp
endif()
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")
endif()
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