Bladeren bron

Merge pull request #809 from commontk/remove-obsolete-usage-of-qt5_use_modules

COMP: Remove obsolete use of remaining "qt5_use_modules"
Jean-Christophe Fillion-Robin 6 jaren geleden
bovenliggende
commit
f09d599e27
2 gewijzigde bestanden met toevoegingen van 2 en 4 verwijderingen
  1. 0 3
      CMake/ctkFunctionCompileSnippets.cmake
  2. 2 1
      Libs/Core/Testing/Cpp/CMakeLists.txt

+ 0 - 3
CMake/ctkFunctionCompileSnippets.cmake

@@ -50,9 +50,6 @@ function(ctkFunctionCompileSnippets snippet_path)
     list(GET main_cpp_dir_tokens -1 snippet_exec_name)
     set(snippet_target_name "Snippet-${snippet_exec_name}")
     add_executable(${snippet_target_name} ${snippet_src_files})
-    if(CTK_QT_VERSION VERSION_GREATER "4" AND qt5_use_modules_list)
-      qt5_use_modules(${snippet_target_name} ${qt5_use_modules_list})
-    endif()
     if(ARGN)
       target_link_libraries(${snippet_target_name} ${ARGN})
     endif()

+ 2 - 1
Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -121,7 +121,8 @@ add_executable(${KIT}CppTests ${Tests} ${Tests_Helpers_SRCS} ${Tests_Helpers_MOC
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES} CTKDummyPlugin)
 
 if(CTK_QT_VERSION VERSION_GREATER "4")
-  qt5_use_modules(${KIT}CppTests Test Widgets)
+  find_package(Qt5 COMPONENTS Test Widgets REQUIRED)
+  target_link_libraries(${KIT}CppTests Qt5::Test Qt5::Widgets)
 endif()
 
 if(UNIX AND NOT APPLE)