cmake: Simplify Qt5/Qt6 handling

7 files changed, 12 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c21b7abd..550ea39a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,18 +10,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules")
 
-# prefer Qt6
-find_package(Qt6 QUIET COMPONENTS Core Network Xml)
-if(NOT Qt6_FOUND)
-    find_package(Qt5 5.7.0 REQUIRED COMPONENTS Core Network Xml)
-endif()
-
-# target names have changed from Qt5::Core -> Qt::Core
-if(Qt6_FOUND)
-    set(QT_TARGET Qt)
-else()
-    set(QT_TARGET Qt5)
-endif()
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Network Xml)
+find_package(Qt${QT_VERSION_MAJOR} 5.7.0 REQUIRED COMPONENTS Core Network Xml)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
diff --git a/examples/example_9_vCard/CMakeLists.txt b/examples/example_9_vCard/CMakeLists.txt
index f548fbbd..3e1ca7ee 100644
--- a/examples/example_9_vCard/CMakeLists.txt
+++ b/examples/example_9_vCard/CMakeLists.txt
@@ -1,7 +1,4 @@
-find_package(Qt6 QUIET COMPONENTS Gui)
-if(NOT Qt6_FOUND)
-    find_package(Qt5 REQUIRED Gui)
-endif()
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui)
 
 add_executable(9_vCard example_9_vCard.cpp)
-target_link_libraries(9_vCard ${QT_TARGET}::Gui qxmpp)
+target_link_libraries(9_vCard Qt${QT_VERSION_MAJOR}::Gui qxmpp)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e35e2c57..672f0467 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -230,9 +230,9 @@ target_include_directories(qxmpp
 
 target_link_libraries(qxmpp
     PUBLIC
-    ${QT_TARGET}::Core
-    ${QT_TARGET}::Network
-    ${QT_TARGET}::Xml
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Network
+    Qt${QT_VERSION_MAJOR}::Xml
 )
 
 if(WITH_GSTREAMER)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cb65d2bc..313d16bc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,14 +1,11 @@
 include_directories(.)
 
-find_package(Qt6 QUIET COMPONENTS Test)
-if(NOT Qt6_FOUND)
-    find_package(Qt5 REQUIRED COMPONENTS Test)
-endif()
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)
 
 macro(add_simple_test TEST_NAME)
     add_executable(tst_${TEST_NAME} ${TEST_NAME}/tst_${TEST_NAME}.cpp)
     add_test(tst_${TEST_NAME} tst_${TEST_NAME})
-    target_link_libraries(tst_${TEST_NAME} ${QT_TARGET}::Test qxmpp)
+    target_link_libraries(tst_${TEST_NAME} Qt${QT_VERSION_MAJOR}::Test qxmpp)
 endmacro()
 
 include_directories(${PROJECT_SOURCE_DIR}/src/base)
diff --git a/tests/qxmpptransfermanager/CMakeLists.txt b/tests/qxmpptransfermanager/CMakeLists.txt
index 9648e694..232dbcbd 100644
--- a/tests/qxmpptransfermanager/CMakeLists.txt
+++ b/tests/qxmpptransfermanager/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmpptransfermanager tst_qxmpptransfermanager.cpp tst_qxmpptransfermanager.qrc)
 add_test(tst_qxmpptransfermanager tst_qxmpptransfermanager)
-target_link_libraries(tst_qxmpptransfermanager ${QT_TARGET}::Test qxmpp)
+target_link_libraries(tst_qxmpptransfermanager Qt${QT_VERSION_MAJOR}::Test qxmpp)
diff --git a/tests/qxmppuploadrequestmanager/CMakeLists.txt b/tests/qxmppuploadrequestmanager/CMakeLists.txt
index 9e74f754..62cdf06d 100644
--- a/tests/qxmppuploadrequestmanager/CMakeLists.txt
+++ b/tests/qxmppuploadrequestmanager/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager.cpp tst_qxmppuploadrequestmanager.qrc)
 add_test(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager)
-target_link_libraries(tst_qxmppuploadrequestmanager ${QT_TARGET}::Test qxmpp)
+target_link_libraries(tst_qxmppuploadrequestmanager Qt${QT_VERSION_MAJOR}::Test qxmpp)
diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt
index 24cf90f0..83032d6b 100644
--- a/tests/qxmpputils/CMakeLists.txt
+++ b/tests/qxmpputils/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmpputils tst_qxmpputils.cpp tst_qxmpputils.qrc)
 add_test(tst_qxmpputils tst_qxmpputils)
-target_link_libraries(tst_qxmpputils ${QT_TARGET}::Test qxmpp)
+target_link_libraries(tst_qxmpputils Qt${QT_VERSION_MAJOR}::Test qxmpp)