@@ -31,7 +31,14 @@ find_package(ament_cmake REQUIRED)
31
31
# do find_package(rviz_ogre_vendor) first to make sure the custom OGRE is found
32
32
find_package (rviz_ogre_vendor REQUIRED)
33
33
34
- find_package (Qt5 REQUIRED COMPONENTS Widgets)
34
+ find_package (QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
35
+ find_package (Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
36
+ if (${QT_VERSION} VERSION_LESS 5.15.0)
37
+ function (qt_wrap_cpp out)
38
+ qt5_wrap_cpp(_sources ${ARGN} )
39
+ set ("${out} " ${_sources} PARENT_SCOPE)
40
+ endfunction ()
41
+ endif ()
35
42
36
43
find_package (geometry_msgs REQUIRED)
37
44
find_package (pluginlib REQUIRED)
@@ -132,7 +139,7 @@ set(rviz_common_headers_to_moc
132
139
)
133
140
134
141
foreach (header "${rviz_common_headers_to_moc} " )
135
- qt5_wrap_cpp (rviz_common_moc_files "${header} " )
142
+ qt_wrap_cpp (rviz_common_moc_files "${header} " )
136
143
endforeach ()
137
144
138
145
set (rviz_common_source_files
@@ -240,7 +247,7 @@ target_link_libraries(rviz_common PUBLIC
240
247
${geometry_msgs_TARGETS}
241
248
message_filters::message_filters
242
249
pluginlib::pluginlib
243
- Qt5 ::Widgets
250
+ Qt ${QT_VERSION_MAJOR} ::Widgets
244
251
rclcpp::rclcpp
245
252
rviz_ogre_vendor::OgreMain
246
253
rviz_ogre_vendor::OgreOverlay
@@ -266,7 +273,7 @@ ament_export_dependencies(
266
273
geometry_msgs
267
274
message_filters
268
275
pluginlib
269
- Qt5
276
+ Qt ${QT_VERSION_MAJOR}
270
277
rclcpp
271
278
rviz_ogre_vendor
272
279
rviz_rendering
@@ -325,10 +332,10 @@ if(BUILD_TESTING)
325
332
find_package (ament_cmake_gmock REQUIRED)
326
333
find_package (ament_cmake_gtest REQUIRED)
327
334
328
- qt5_wrap_cpp (rviz_common_test_moc_files test /mock_display.hpp)
329
- qt5_wrap_cpp (rviz_common_test_moc_files test /mock_property_change_receiver.hpp)
335
+ qt_wrap_cpp (rviz_common_test_moc_files test /mock_display.hpp)
336
+ qt_wrap_cpp (rviz_common_test_moc_files test /mock_property_change_receiver.hpp)
330
337
331
- qt5_wrap_cpp (rviz_common_test_frame_manager_moc src/rviz_common/frame_manager.hpp)
338
+ qt_wrap_cpp (rviz_common_test_frame_manager_moc src/rviz_common/frame_manager.hpp)
332
339
333
340
ament_add_gmock(display_factory_test
334
341
test /display_factory_test.cpp
@@ -337,7 +344,7 @@ if(BUILD_TESTING)
337
344
if (TARGET display_factory_test)
338
345
target_compile_definitions (display_factory_test PUBLIC
339
346
-D_TEST_PLUGIN_DESCRIPTIONS="${CMAKE_CURRENT_SOURCE_DIR} " )
340
- target_link_libraries (display_factory_test rviz_common Qt5 ::Widgets)
347
+ target_link_libraries (display_factory_test rviz_common Qt ${QT_VERSION_MAJOR} ::Widgets)
341
348
endif ()
342
349
343
350
ament_add_gmock(frame_manager_test
@@ -446,7 +453,7 @@ if(BUILD_TESTING)
446
453
test /mock_property_change_receiver.cpp
447
454
${SKIP_DISPLAY_TESTS} )
448
455
if (TARGET rviz_common_display_test)
449
- target_link_libraries (rviz_common_display_test rviz_common Qt5 ::Widgets yaml-cpp::yaml-cpp)
456
+ target_link_libraries (rviz_common_display_test rviz_common Qt ${QT_VERSION_MAJOR} ::Widgets yaml-cpp::yaml-cpp)
450
457
endif ()
451
458
endif ()
452
459
0 commit comments