From b905afb1694ab168ab2a4553ed567a8b3dd1739f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 3 Sep 2023 14:01:38 +0200
Subject: [PATCH] CMake: restrict Qt6 build

- build **only** libcalamares
- switch the finding and linking of Qt modules to use qtname
---
 CMakeLists.txt                  |  4 ++++
 src/CMakeLists.txt              |  2 ++
 src/libcalamares/CMakeLists.txt | 18 +++++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6e48217..8757a543a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,7 +453,9 @@ endif()
 set(CALAMARES_TRANSLATION_LANGUAGES en ${_tx_complete} ${_tx_good} ${_tx_ok})
 list(SORT CALAMARES_TRANSLATION_LANGUAGES)
 
+if(NOT WITH_QT6) # TODO: Qt6
 add_subdirectory(lang) # i18n tools
+endif()
 
 ### Example Distro
 #
@@ -638,7 +640,9 @@ endif()
 
 ### CMAKE SUMMARY REPORT
 #
+if(NOT WITH_QT6) # TODO: Qt6
 get_directory_property(SKIPPED_MODULES DIRECTORY src/modules DEFINITION LIST_SKIPPED_MODULES)
+endif()
 calamares_explain_skipped_modules( ${SKIPPED_MODULES} )
 
 feature_summary(WHAT DISABLED_FEATURES DESCRIPTION "The following features have been disabled:" QUIET_ON_EMPTY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1a536f91..97e678083 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@ include(CalamaresAddTranslations)
 # library
 add_subdirectory(libcalamares)
 
+if(NOT WITH_QT6) # TODO: Qt6
 add_subdirectory(libcalamaresui)
 
 # all things qml
@@ -26,3 +27,4 @@ add_subdirectory(modules)
 
 # branding components
 add_subdirectory(branding)
+endif()
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 767c2ab39..61971e6b2 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -100,14 +100,14 @@ set_target_properties(
         SOVERSION ${CALAMARES_SOVERSION}
         INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_INSTALL_FULL_INCLUDEDIR}/libcalamares
 )
-target_link_libraries(calamares LINK_PUBLIC yamlcpp::yamlcpp Qt5::Core KF5::CoreAddons)
+target_link_libraries(calamares LINK_PUBLIC yamlcpp::yamlcpp ${qtname}::Core KF5::CoreAddons)
 
 ### OPTIONAL Automount support (requires dbus)
 #
 #
-if(Qt5DBus_FOUND)
+if(TARGET ${qtname}::DBus)
     target_sources(calamares PRIVATE partition/AutoMount.cpp)
-    target_link_libraries(calamares PRIVATE Qt5::DBus)
+    target_link_libraries(calamares PRIVATE ${qtname}::DBus)
 endif()
 
 ### OPTIONAL Python support
@@ -121,10 +121,10 @@ endif()
 ### OPTIONAL GeoIP XML support
 #
 #
-find_package(Qt5 COMPONENTS Xml)
-if(Qt5Xml_FOUND)
+find_package(${qtname} ${QT_VERSION} COMPONENTS Xml)
+if(TARGET ${qtname}::Xml)
     target_sources(calamares PRIVATE geoip/GeoIPXML.cpp)
-    target_link_libraries(calamares PRIVATE Qt5::Network Qt5::Xml)
+    target_link_libraries(calamares PRIVATE ${qtname}::Network ${qtname}::Xml)
 endif()
 
 ### OPTIONAL KPMcore support
@@ -274,10 +274,10 @@ calamares_add_test(libcalamaresutilspathstest SOURCES utils/TestPaths.cpp)
 # This is not an actual test, it's a test / demo application
 # for experimenting with GeoIP.
 add_executable(test_geoip geoip/test_geoip.cpp ${geoip_src})
-target_link_libraries(test_geoip Calamares::calamares Qt5::Network yamlcpp::yamlcpp)
+target_link_libraries(test_geoip Calamares::calamares ${qtname}::Network yamlcpp::yamlcpp)
 calamares_automoc( test_geoip )
 
-if(Qt5DBus_FOUND)
+if(TARGET ${qtname}::DBus)
     add_executable(test_automount partition/calautomount.cpp)
-    target_link_libraries(test_automount Calamares::calamares Qt5::DBus)
+    target_link_libraries(test_automount Calamares::calamares ${qtname}::DBus)
 endif()