Change the buildsystem to support building with Qt6

Author: Ahmad Samir

CMakeLists.txt

@@ -13,7 +13,15 @@ set(CMAKE_AUTORCC ON)
 option(BUILD_TESTS "Build Unit Tests" OFF)
 option(BUILD_EXAMPLE "Build Example Application" ON)
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Widgets)
+option(BUILD_WITH_QT6 "Build with Qt6" OFF)
+if(BUILD_WITH_QT6)
+    set(QT_MAJOR_VERSION 6)
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(QT_MAJOR_VERSION 5)
+endif()
+
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED Widgets)
 
 include(GNUInstallDirs)
 include(FeatureSummary)
@@ -27,7 +35,7 @@ if (BUILD_EXAMPLE)
 endif (BUILD_EXAMPLE)
 
 if (BUILD_TESTS)
-    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Test)
+    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED Test)
     enable_testing()
     add_subdirectory(tests)
 endif (BUILD_TESTS)
@@ -49,7 +57,7 @@ target_include_directories(kColorPicker
 						   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 						   )
 
-target_link_libraries(kColorPicker PUBLIC Qt5::Widgets)
+target_link_libraries(kColorPicker PUBLIC Qt${QT_MAJOR_VERSION}::Widgets)
 
 target_compile_definitions(kColorPicker PRIVATE KIMAGEANNOTATOR_LIB)
 

cmake/kColorPickerConfig.cmake.in

@@ -2,8 +2,8 @@ include(CMakeFindDependencyMacro)
 
 @PACKAGE_INIT@
 
-find_dependency(Qt5 @QT_MIN_VERSION@ COMPONENTS Widgets)
+find_dependency(Qt@QT_MAJOR_VERSION@ @QT_MIN_VERSION@ COMPONENTS Widgets)
 
 if(NOT TARGET kColorPicker::kColorPicker)
   include("${CMAKE_CURRENT_LIST_DIR}/kColorPicker-targets.cmake")
-endif()
+endif()

tests/CMakeLists.txt

@@ -4,11 +4,11 @@ set(UNITTEST_SRC
 
 add_library(KCOLORPICKER_STATIC STATIC ${KCOLORPICKER_SRCS})
 
-target_link_libraries(KCOLORPICKER_STATIC Qt5::Widgets kColorPicker)
+target_link_libraries(KCOLORPICKER_STATIC Qt${QT_MAJOR_VERSION}::Widgets kColorPicker)
 
 foreach (UnitTest ${UNITTEST_SRC})
     get_filename_component(UnitTestName ${UnitTest} NAME_WE)
     add_executable(${UnitTestName} ${UnitTest})
-    target_link_libraries(${UnitTestName} KCOLORPICKER_STATIC Qt5::Test)
+    target_link_libraries(${UnitTestName} KCOLORPICKER_STATIC Qt${QT_MAJOR_VERSION}::Test)
     add_test(${UnitTestName} ${UnitTestName})
-endforeach (UnitTest)
+endforeach (UnitTest)