Skip to content

Commit 51ab458

Browse files
authored
Changes to build with qt6 (#230)
Signed-off-by: Yadunund <yadunund@intrinsic.ai>
1 parent 9fcfc31 commit 51ab458

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

rviz_imu_plugin/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ endif()
1212

1313
find_package(ament_cmake REQUIRED COMPONENTS rviz)
1414
find_package(message_filters REQUIRED)
15-
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Test)
16-
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Test)
15+
find_package(Qt6 QUIET COMPONENTS Test Widgets)
16+
if(NOT Qt6_FOUND)
17+
find_package(Qt5 REQUIRED COMPONENTS Test Widgets)
18+
endif()
1719
find_package(rviz_common REQUIRED)
1820
find_package(rviz_ogre_vendor REQUIRED)
1921
find_package(rviz_rendering REQUIRED)

rviz_imu_plugin/package.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<buildtool_depend>ament_cmake</buildtool_depend>
1515

16-
<build_depend>qt6-base-dev</build_depend>
16+
<build_depend>qt-base-dev</build_depend>
1717

1818
<depend>message_filters</depend>
1919
<depend>pluginlib</depend>
@@ -25,10 +25,10 @@
2525
<depend>tf2</depend>
2626
<depend>tf2_ros</depend>
2727

28-
<exec_depend>libqt6-core</exec_depend>
29-
<exec_depend>libqt6gui6t64</exec_depend>
30-
<exec_depend>libqt6opengl6t64</exec_depend>
31-
<exec_depend>libqt6widgets6t64</exec_depend>
28+
<exec_depend>libqtcore</exec_depend>
29+
<exec_depend>libqtgui</exec_depend>
30+
<exec_depend>libqtopengl</exec_depend>
31+
<exec_depend>libqtwidgets</exec_depend>
3232

3333
<export>
3434
<rosdoc config="${prefix}/rosdoc.yaml"/>

0 commit comments

Comments
 (0)