update workaround in rviz_rendering_tests

Signed-off-by: wep21 <[email protected]>
ros2 · May 18, 2024 · 5859791 · 5859791
1 parent a8a60a1
commit 5859791
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/rviz_rendering_tests/CMakeLists.txt b/rviz_rendering_tests/CMakeLists.txt
@@ -32,14 +32,17 @@ find_package(ament_cmake REQUIRED)
 if(BUILD_TESTING)
   # do find_package(rviz_ogre_vendor) first to make sure the custom OGRE is found
   find_package(rviz_ogre_vendor REQUIRED)
-  if(Qt5_DIR AND NOT QT_DIR)
-    set(QT_DIR "${Qt5_DIR}" CACHE PATH "" FORCE)
+  if(MSVC)
+    set(QT_VERSION_MAJOR 5)
+    find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+    function(qt_wrap_cpp out)
+      qt5_wrap_cpp(_sources ${ARGN})
+      set("${out}" ${_sources} PARENT_SCOPE)
+    endfunction()
+  else()
+    find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+    find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
   endif()
-  if(Qt6_DIR AND NOT QT_DIR)
-    set(QT_DIR "{Qt6_DIR}" CACHE PATH "" FORCE)
-  endif()
-  find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
-  find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
   find_package(rviz_rendering REQUIRED)
   find_package(resource_retriever REQUIRED)