File 0001-Make-Qt5-build-default-and-simplify-logic-... of Package liblastfm-qt5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch of Package liblastfm-qt5 (Revision a752f1b3031a783fe53acf95f4edea3b)

Currently displaying revision a752f1b3031a783fe53acf95f4edea3b , Show latest

From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 1 Apr 2018 11:51:42 +0200
Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing
 deps

---
 CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be88967..e628611 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
 # setup qt stuff
 set(CMAKE_AUTOMOC ON)
 
-option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
 
-if( NOT BUILD_WITH_QT4 )
-    # try Qt5 first, and prefer that if found
-    find_package(Qt5Core QUIET)
-endif()
+if(NOT BUILD_WITH_QT4)
+    find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG)
+
+    if(BUILD_FINGERPRINT)
+        find_package(Qt5Sql REQUIRED CONFIG)
+    endif()
 
-if(Qt5Core_DIR)
     set(LASTFM_LIB_VERSION_SUFFIX 5)
-    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
     include_directories(${Qt5Core_INCLUDE_DIRS})
     if(UNIX AND NOT APPLE)
-        find_package(Qt5DBus REQUIRED)
+        find_package(Qt5DBus REQUIRED CONFIG)
     endif()
 
 #     macro(qt_wrap_ui)
-- 
2.17.0

Places

File 0001-Make-Qt5-build-default-and-simplify-logic-add-missin.patch of Package liblastfm-qt5 (Revision a752f1b3031a783fe53acf95f4edea3b)

Places