feat: add Qt 6 support to CMake

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

CMakeLists.txt

@@ -154,6 +154,7 @@ add_custom_target(tcversion echo "\\#\\#teamcity[setParameter name=\\'env.LAUNCH
 ################################ 3rd Party Libs ################################
 
 # Find the required Qt parts
+include(QtVersionlessBackport)
 if(Launcher_QT_VERSION_MAJOR EQUAL 5)
     set(QT_VERSION_MAJOR 5)
     find_package(Qt5 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml)
@@ -165,6 +166,18 @@ if(Launcher_QT_VERSION_MAJOR EQUAL 5)
         set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE)
         set(FORCE_BUNDLED_QUAZIP 1)
     endif()
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    set(QT_VERSION_MAJOR 6)
+    find_package(Qt6 REQUIRED COMPONENTS Core Widgets Concurrent Network Test Xml Core5Compat)
+    list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)
+
+    if(NOT Launcher_FORCE_BUNDLED_LIBS)
+        find_package(QuaZip-Qt6 1.3 QUIET)
+    endif()
+    if (NOT QuaZip-Qt6_FOUND)
+        set(QUAZIP_QT_MAJOR_VERSION ${QT_VERSION_MAJOR} CACHE STRING "Qt version to use (4, 5 or 6), defaults to ${QT_VERSION_MAJOR}" FORCE)
+        set(FORCE_BUNDLED_QUAZIP 1)
+    endif()
 else()
     message(FATAL_ERROR "Qt version ${Launcher_QT_VERSION_MAJOR} is not supported")
 endif()

buildconfig/CMakeLists.txt

@@ -7,5 +7,5 @@ add_library(BuildConfig STATIC
     ${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp
 )
 
-target_link_libraries(BuildConfig Qt5::Core)
+target_link_libraries(BuildConfig Qt${QT_VERSION_MAJOR}::Core)
 target_include_directories(BuildConfig PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")

cmake/QMakeQuery.cmake

@@ -3,7 +3,11 @@ if(__QMAKEQUERY_CMAKE__)
 endif()
 set(__QMAKEQUERY_CMAKE__ TRUE)
 
-get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+if(QT_VERSION_MAJOR EQUAL 5)
+    get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+elseif(QT_VERSION_MAJOR EQUAL 6)
+    get_target_property(QMAKE_EXECUTABLE Qt6::qmake LOCATION)
+endif()
 
 function(QUERY_QMAKE VAR RESULT)
     exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )

cmake/QtVersionlessBackport.cmake

@@ -0,0 +1,97 @@
+#=============================================================================
+# Copyright 2005-2011 Kitware, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Kitware, Inc. nor the names of its
+#   contributors may be used to endorse or promote products derived
+#   from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+# From Qt5CoreMacros.cmake
+
+function(qt_generate_moc)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_generate_moc(${ARGV})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_generate_moc(${ARGV})
+    endif()
+endfunction()
+
+function(qt_wrap_cpp outfiles)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_wrap_cpp("${outfiles}" ${ARGN})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_wrap_cpp("${outfiles}" ${ARGN})
+    endif()
+    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+endfunction()
+
+function(qt_add_binary_resources)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_add_binary_resources(${ARGV})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_add_binary_resources(${ARGV})
+    endif()
+endfunction()
+
+function(qt_add_resources outfiles)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_add_resources("${outfiles}" ${ARGN})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_add_resources("${outfiles}" ${ARGN})
+    endif()
+    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+endfunction()
+
+function(qt_add_big_resources outfiles)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_add_big_resources(${outfiles} ${ARGN})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_add_big_resources(${outfiles} ${ARGN})
+    endif()
+    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+endfunction()
+
+function(qt_import_plugins)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_import_plugins(${ARGV})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_import_plugins(${ARGV})
+    endif()
+endfunction()
+
+
+# From Qt5WidgetsMacros.cmake
+
+function(qt_wrap_ui outfiles)
+    if(QT_VERSION_MAJOR EQUAL 5)
+        qt5_wrap_ui("${outfiles}" ${ARGN})
+    elseif(QT_VERSION_MAJOR EQUAL 6)
+        qt6_wrap_ui("${outfiles}" ${ARGN})
+    endif()
+    set("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
+endfunction()
+

launcher/CMakeLists.txt

@@ -88,10 +88,10 @@ set(CORE_SOURCES
     MMCTime.cpp
 )
 
-ecm_add_test(FileSystem_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(FileSystem_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME FileSystem)  # TODO: needs testdata
 
-ecm_add_test(GZip_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(GZip_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME GZip)
 
 set(PATHMATCHER_SOURCES
@@ -338,7 +338,7 @@ set(MINECRAFT_SOURCES
     mojang/PackageManifest.cpp
     minecraft/Agent.h)
 
-ecm_add_test(minecraft/GradleSpecifier_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(minecraft/GradleSpecifier_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME GradleSpecifier)
 
 if(BUILD_TESTING)
@@ -347,7 +347,7 @@ if(BUILD_TESTING)
     )
     target_link_libraries(PackageManifest
         Launcher_logic
-        Qt5::Test
+        Qt${QT_VERSION_MAJOR}::Test
     )
     target_include_directories(PackageManifest
         PRIVATE ../cmake/UnitTest/
@@ -360,18 +360,18 @@ if(BUILD_TESTING)
 endif()
 
 # TODO: needs minecraft/testdata
-ecm_add_test(minecraft/MojangVersionFormat_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(minecraft/MojangVersionFormat_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME MojangVersionFormat)
 
-ecm_add_test(minecraft/Library_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(minecraft/Library_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME Library)
 
 # FIXME: shares data with FileSystem test
 # TODO: needs testdata
-ecm_add_test(minecraft/mod/ModFolderModel_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(minecraft/mod/ModFolderModel_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME ModFolderModel)
 
-ecm_add_test(minecraft/ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(minecraft/ParseUtils_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME ParseUtils)
 
 # the screenshots feature
@@ -393,7 +393,7 @@ set(TASKS_SOURCES
     tasks/SequentialTask.cpp
 )
 
-ecm_add_test(tasks/Task_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(tasks/Task_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME Task)
 
 set(SETTINGS_SOURCES
@@ -412,7 +412,7 @@ set(SETTINGS_SOURCES
     settings/SettingsObject.h
 )
 
-ecm_add_test(settings/INIFile_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(settings/INIFile_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME INIFile)
 
 set(JAVA_SOURCES
@@ -430,7 +430,7 @@ set(JAVA_SOURCES
     java/JavaVersion.cpp
 )
 
-ecm_add_test(java/JavaVersion_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(java/JavaVersion_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME JavaVersion)
 
 set(TRANSLATIONS_SOURCES
@@ -524,7 +524,7 @@ set(PACKWIZ_SOURCES
 )
 
 # TODO: needs modplatform/packwiz/testdata
-ecm_add_test(modplatform/packwiz/Packwiz_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(modplatform/packwiz/Packwiz_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME Packwiz)
 
 set(TECHNIC_SOURCES
@@ -549,7 +549,7 @@ set(ATLAUNCHER_SOURCES
     modplatform/atlauncher/ATLShareCode.h
 )
 
-ecm_add_test(meta/Index_test.cpp LINK_LIBRARIES Launcher_logic Qt5::Test
+ecm_add_test(meta/Index_test.cpp LINK_LIBRARIES Launcher_logic Qt${QT_VERSION_MAJOR}::Test
     TEST_NAME Index)
 
 ################################ COMPILE ################################
@@ -880,7 +880,7 @@ SET(LAUNCHER_SOURCES
     ui/instanceview/VisualGroup.h
 )
 
-qt5_wrap_ui(LAUNCHER_UI
+qt_wrap_ui(LAUNCHER_UI
     ui/setupwizard/PasteWizardPage.ui
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
@@ -933,7 +933,7 @@ qt5_wrap_ui(LAUNCHER_UI
     ui/dialogs/ScrollMessageBox.ui
 )
 
-qt5_add_resources(LAUNCHER_RESOURCES
+qt_add_resources(LAUNCHER_RESOURCES
     resources/backgrounds/backgrounds.qrc
     resources/multimc/multimc.qrc
     resources/pe_dark/pe_dark.qrc
@@ -963,7 +963,7 @@ target_link_libraries(Launcher_logic
     tomlc99
     BuildConfig
     Katabasis
-    Qt5::Widgets
+    Qt${QT_VERSION_MAJOR}::Widgets
 )
 
 if (UNIX AND NOT CYGWIN AND NOT APPLE)
@@ -973,12 +973,13 @@ if (UNIX AND NOT CYGWIN AND NOT APPLE)
 endif()
 
 target_link_libraries(Launcher_logic
-    Qt5::Core
+    Qt${QT_VERSION_MAJOR}::Core
-    Qt5::Xml
+    Qt${QT_VERSION_MAJOR}::Xml
-    Qt5::Network
+    Qt${QT_VERSION_MAJOR}::Network
-    Qt5::Concurrent
+    Qt${QT_VERSION_MAJOR}::Concurrent
-    Qt5::Gui
+    Qt${QT_VERSION_MAJOR}::Gui
-    Qt5::Widgets
+    Qt${QT_VERSION_MAJOR}::Widgets
+    ${Launcher_QT_LIBS}
 )
 target_link_libraries(Launcher_logic
     QuaZip::QuaZip

libraries/LocalPeer/CMakeLists.txt

@@ -1,7 +1,12 @@
 cmake_minimum_required(VERSION 3.9.4)
 project(LocalPeer)
 
-find_package(Qt5 COMPONENTS Core Network REQUIRED)
+if(QT_VERSION_MAJOR EQUAL 5)
+    find_package(Qt5 COMPONENTS Core Network REQUIRED)
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    find_package(Qt6 COMPONENTS Core Network Core5Compat REQUIRED)
+    list(APPEND LocalPeer_LIBS Qt${QT_VERSION_MAJOR}::Core5Compat)
+endif()
 
 set(SINGLE_SOURCES
 src/LocalPeer.cpp
@@ -25,4 +30,4 @@ endif()
 add_library(LocalPeer STATIC ${SINGLE_SOURCES})
 target_include_directories(LocalPeer PUBLIC include)
 
-target_link_libraries(LocalPeer Qt5::Core Qt5::Network)
+target_link_libraries(LocalPeer Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network ${LocalPeer_LIBS})

libraries/classparser/CMakeLists.txt

@@ -10,10 +10,11 @@ if(${BIGENDIAN})
 endif(${BIGENDIAN})
 
 # Find Qt
-find_package(Qt5Core REQUIRED)
+if(QT_VERSION_MAJOR EQUAL 5)
-
+    find_package(Qt5 COMPONENTS Core REQUIRED)
-# Include Qt headers.
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
-include_directories(${Qt5Base_INCLUDE_DIRS})
+    find_package(Qt6 COMPONENTS Core REQUIRED)
+endif()
 
 set(CLASSPARSER_HEADERS
 # Public headers
@@ -38,4 +39,4 @@ add_definitions(-DCLASSPARSER_LIBRARY)
 
 add_library(Launcher_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
 target_include_directories(Launcher_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt5::Core)
+target_link_libraries(Launcher_classparser QuaZip::QuaZip Qt${QT_VERSION_MAJOR}::Core)

libraries/katabasis/CMakeLists.txt

@@ -16,7 +16,11 @@ set(CMAKE_C_STANDARD_REQUIRED true)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_C_STANDARD 11)
 
-find_package(Qt5 COMPONENTS Core Network REQUIRED)
+if(QT_VERSION_MAJOR EQUAL 5)
+    find_package(Qt5 COMPONENTS Core Network REQUIRED)
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    find_package(Qt6 COMPONENTS Core Network REQUIRED)
+endif()
 
 set( katabasis_PRIVATE
     src/DeviceFlow.cpp
@@ -35,7 +39,7 @@ set( katabasis_PUBLIC
 )
 
 add_library( Katabasis STATIC ${katabasis_PRIVATE} ${katabasis_PUBLIC} )
-target_link_libraries(Katabasis Qt5::Core Qt5::Network)
+target_link_libraries(Katabasis Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)
 
 # needed for statically linked Katabasis in shared libs on x86_64
 set_target_properties(Katabasis

libraries/rainbow/CMakeLists.txt

@@ -1,8 +1,11 @@
 cmake_minimum_required(VERSION 3.9.4)
 project(rainbow)
 
-find_package(Qt5Core REQUIRED QUIET)
+if(QT_VERSION_MAJOR EQUAL 5)
-find_package(Qt5Gui REQUIRED QUIET)
+    find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    find_package(Qt6 COMPONENTS Core Gui REQUIRED)
+endif()
 
 set(RAINBOW_SOURCES
 src/rainbow.cpp
@@ -11,4 +14,4 @@ src/rainbow.cpp
 add_library(Launcher_rainbow STATIC ${RAINBOW_SOURCES})
 target_include_directories(Launcher_rainbow PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
-target_link_libraries(Launcher_rainbow Qt5::Core Qt5::Gui)
+target_link_libraries(Launcher_rainbow Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)

libraries/systeminfo/CMakeLists.txt

@@ -1,6 +1,11 @@
 project(systeminfo)
 
-find_package(Qt5Core)
+if(QT_VERSION_MAJOR EQUAL 5)
+    find_package(Qt5 COMPONENTS Core REQUIRED)
+elseif(Launcher_QT_VERSION_MAJOR EQUAL 6)
+    find_package(Qt6 COMPONENTS Core Core5Compat REQUIRED)
+    list(APPEND systeminfo_LIBS Qt${QT_VERSION_MAJOR}::Core5Compat)
+endif()
 
 set(systeminfo_SOURCES
 include/sys.h
@@ -19,7 +24,7 @@ elseif (UNIX)
 endif()
 
 add_library(systeminfo STATIC ${systeminfo_SOURCES})
-target_link_libraries(systeminfo Qt5::Core Qt5::Gui Qt5::Network)
+target_link_libraries(systeminfo Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network ${systeminfo_LIBS})
 target_include_directories(systeminfo PUBLIC include)
 
-ecm_add_test(src/sys_test.cpp LINK_LIBRARIES systeminfo Qt5::Test TEST_NAME sys)
+ecm_add_test(src/sys_test.cpp LINK_LIBRARIES systeminfo Qt${QT_VERSION_MAJOR}::Test TEST_NAME sys)