From 0e90d88113378e13707c7526a7a738fb2c153f75 Mon Sep 17 00:00:00 2001
From: Johannes Steinmetz <J.Steinmetz@kruss.de>
Date: Wed, 13 Mar 2024 17:29:34 +0100
Subject: [PATCH] make cmake work with detected QT6

This is more in style how QT does QT major version agnostic builds.
It works for my system, while the way it was done in upstream did not,
but since I am no Cmake wizard and can not test on windows your
experience might differ.
---
 CMakeLists.txt        | 32 +++++++++++---------------------
 manual/CMakeLists.txt |  2 +-
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec86073dc..febff5d09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(pulseview C CXX)
 
@@ -155,14 +155,8 @@ set(CMAKE_AUTOMOC TRUE)
 
 # Check for Qt5, and check for Qt6 if Qt5 is not found.
 set(QT_COMPONENTS Core Gui LinguistTools Widgets Svg)
-find_package(Qt5 5.3 QUIET COMPONENTS Core)
-if(Qt5_FOUND)
-	find_package(Qt5 5.3 COMPONENTS ${QT_COMPONENTS} REQUIRED)
-	message(STATUS "Qt version: ${Qt5_VERSION}")
-else()
-	find_package(Qt6 6.2 COMPONENTS ${QT_COMPONENTS} REQUIRED)
-	message(STATUS "Qt version: ${Qt6_VERSION}")
-endif()
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS ${QT_COMPONENTS} )
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS} )
 
 if(WIN32)
 	# MXE workaround: Use pkg-config to find Qt5 and Qt6 libs.
@@ -177,11 +171,7 @@ if(WIN32)
 	endif()
 endif()
 
-if(Qt5_FOUND)
-	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
-else()
-	set(QT_LIBRARIES Qt6::Gui Qt6::Widgets Qt6::Svg)
-endif()
+set(QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg)
 
 set(BOOSTCOMPS filesystem serialization system)
 if(ENABLE_TESTS)
@@ -530,7 +520,7 @@ endif()
 if(Qt5_FOUND)
 	qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
-	qt6_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
+	qt_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 endif()
 
 #===============================================================================
@@ -550,10 +540,10 @@ if(Qt5_FOUND)
 		qt5_create_translation(QM_FILES ${pulseview_SOURCES} ${TS_FILES})
 	endif ()
 else()
-	qt6_add_translation(QM_FILES ${TS_FILES})
-	qt6_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc)
+	qt_add_translation(QM_FILES ${TS_FILES})
+	qt_add_resources(pulseview_RESOURCES_RCC ${CMAKE_BINARY_DIR}/translations.qrc)
 	if (ENABLE_TS_UPDATE)
-		qt6_create_translation(QM_FILES ${pulseview_SOURCES} ${TS_FILES})
+		qt_create_translation(QM_FILES ${pulseview_SOURCES} ${TS_FILES})
 	endif ()
 endif()
 
@@ -645,9 +635,9 @@ if(WIN32)
 		endif()
 		list(APPEND PULSEVIEW_LINK_LIBS ${QT5ALL_LDFLAGS})
 	else()
-		list(APPEND PULSEVIEW_LINK_LIBS Qt6::QSvgPlugin)
-		list(APPEND PULSEVIEW_LINK_LIBS Qt6::QWindowsIntegrationPlugin)
-		list(APPEND PULSEVIEW_LINK_LIBS ${QT6ALL_LDFLAGS})
+		list(APPEND PULSEVIEW_LINK_LIBS Qt${QT_VERSION_MAJOR}::QSvgPlugin)
+		list(APPEND PULSEVIEW_LINK_LIBS Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin)
+		list(APPEND PULSEVIEW_LINK_LIBS ${QT${QT_VERSION_MAJOR}ALL_LDFLAGS})
 	endif()
 endif()
 
diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
index 3b881a56d..239cc1717 100644
--- a/manual/CMakeLists.txt
+++ b/manual/CMakeLists.txt
@@ -17,7 +17,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(PV_MANUAL)