COMP: Generalize macros to support Qt6 based on CTK_QT_VERSION

This change updates various CMake macros to handle Qt6 by using CTK_QT_VERSION.
It replaces hardcoded Qt5 references with version-agnostic code where possible.

Author: jcfr

CMake/ctkFunctionGeneratePluginManifest.cmake

@@ -105,7 +105,7 @@ function(ctkFunctionGeneratePluginManifest MANIFEST_QRC_FILEPATH_VAR)
     set(${MANIFEST_QRC_FILEPATH_VAR} ${_manifest_qrc_filepath} PARENT_SCOPE)
   else()
     if(CTK_QT_VERSION VERSION_EQUAL "5")
-      QT5_ADD_RESOURCES(_qrc_src ${_manifest_qrc_filepath})
+      qt_add_resources(_qrc_src ${_manifest_qrc_filepath})
     else()
       message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")
     endif()

CMake/ctkMacroBuildPlugin.cmake

@@ -194,7 +194,7 @@ macro(ctkMacroBuildPlugin)
     set_source_files_properties(${MY_TRANSLATIONS}
                                 PROPERTIES OUTPUT_LOCATION ${_translations_dir})
   if(CTK_QT_VERSION VERSION_EQUAL "5")
-      qt5_create_translation(_plugin_qm_files ${MY_SRCS} ${MY_UI_FORMS} ${MY_TRANSLATIONS})
+      qt_create_translation(_plugin_qm_files ${MY_SRCS} ${MY_UI_FORMS} ${MY_TRANSLATIONS})
   else()
     message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")
   endif()

CMake/ctkMacroBuildQtPlugin.cmake

@@ -172,8 +172,8 @@ macro(ctkMacroBuildQtPlugin)
 endmacro()
 
 macro(ctkMacroBuildQtDesignerPlugin)
+  find_package(Qt${CTK_QT_VERSION} COMPONENTS Designer REQUIRED)
   if(CTK_QT_VERSION VERSION_EQUAL "5")
-    find_package(Qt5 COMPONENTS Designer REQUIRED)
     add_definitions(${Qt5Designer_DEFINITIONS})
     include_directories(${Qt5Designer_INCLUDE_DIRS})
   else()
@@ -182,17 +182,13 @@ macro(ctkMacroBuildQtDesignerPlugin)
   ctkMacroBuildQtPlugin(
     PLUGIN_DIR designer
     ${ARGN})
-  if(CTK_QT_VERSION VERSION_EQUAL "5")
-    cmake_parse_arguments(MY
-      "" # no options
-      "NAME;EXPORT_DIRECTIVE;FOLDER;PLUGIN_DIR" # one value args
-      "SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES" # multi value args
-      ${ARGN}
-      )
-    target_link_libraries(${MY_NAME} Qt5::Designer)
-  else()
-    message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")
-  endif()
+  cmake_parse_arguments(MY
+    "" # no options
+    "NAME;EXPORT_DIRECTIVE;FOLDER;PLUGIN_DIR" # one value args
+    "SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES" # multi value args
+    ${ARGN}
+    )
+  target_link_libraries(${MY_NAME} Qt${CTK_QT_VERSION}::Designer)
 endmacro()
 
 macro(ctkMacroBuildQtIconEnginesPlugin)

CMake/ctkMacroSetupPlugins.cmake

@@ -105,11 +105,11 @@ macro(ctkMacroSetupPlugins )
   # Qt shared libraries
   if(CTK_QT_VERSION VERSION_EQUAL "5")
     if(WIN32)
-      get_target_property(_qt5_moc_executable Qt5::moc LOCATION)
-      get_filename_component(QT_INSTALLED_LIBRARY_DIR ${_qt5_moc_executable} PATH)
+      get_target_property(_qt_moc_executable Qt${CTK_QT_VERSION}::moc LOCATION)
+      get_filename_component(QT_INSTALLED_LIBRARY_DIR ${_qt_moc_executable} PATH)
     else()
-      get_target_property(_qt5_core_lib Qt5::Core LOCATION)
-      get_filename_component(QT_INSTALLED_LIBRARY_DIR ${_qt5_core_lib} PATH)
+      get_target_property(_qt_core_lib Qt${CTK_QT_VERSION}::Core LOCATION)
+      get_filename_component(QT_INSTALLED_LIBRARY_DIR ${_qt_core_lib} PATH)
     endif()
   else()
     message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")

CMake/ctkMacroSetupQt.cmake

@@ -23,7 +23,7 @@ macro(ctkMacroSetupQt)
 
   if(CTK_QT_VERSION VERSION_EQUAL "5")
     cmake_minimum_required(VERSION 3.20.6)
-    find_package(Qt5 COMPONENTS Core)
+    find_package(Qt${CTK_QT_VERSION} COMPONENTS Core)
 
     set(CTK_QT_COMPONENTS Core)
 

Libs/PluginFramework/Documentation/Snippets/EventAdmin-Intro/files.cmake

@@ -9,7 +9,7 @@ set(_moc_files
 
 foreach(_moc_file ${_moc_files})
   if(CTK_QT_VERSION VERSION_EQUAL "5")
-    QT5_WRAP_CPP(snippet_src_files EventAdmin-Intro/${_moc_file}
+    qt_wrap_cpp(snippet_src_files EventAdmin-Intro/${_moc_file}
       OPTIONS -f${CMAKE_CURRENT_SOURCE_DIR}/EventAdmin-Intro/${_moc_file})
   else()
     message(FATAL_ERROR "Support for Qt${CTK_QT_VERSION} is not implemented")

Libs/Widgets/CMakeLists.txt

@@ -242,7 +242,11 @@ set(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
-  list(APPEND KIT_target_libraries Qt5::Widgets Qt5::Xml Qt5::OpenGL)
+list(APPEND KIT_target_libraries
+  Qt${CTK_QT_VERSION}::Widgets
+  Qt${CTK_QT_VERSION}::Xml
+  Qt${CTK_QT_VERSION}::OpenGL
+  )
 
 # A player and a translator must be added for custom Qt widgets
 if(CTK_USE_QTTESTING)

Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -225,9 +225,9 @@ set_target_properties(${KIT}CppTests PROPERTIES
   )
 
 if(CTK_QT_VERSION VERSION_EQUAL "5")
-  list(APPEND KIT_target_libraries Qt5::Test)
+  list(APPEND KIT_target_libraries Qt${CTK_QT_VERSION}::Test)
   if(CTK_USE_QTTESTING)
-    list(APPEND KIT_target_libraries Qt5::Xml Qt5::XmlPatterns)
+    list(APPEND KIT_target_libraries Qt${CTK_QT_VERSION}::Xml Qt${CTK_QT_VERSION}::XmlPatterns)
   endif()
   target_link_libraries(${KIT}CppTests ${KIT_target_libraries})
 else()