Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions turtlesim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ find_package(ament_cmake REQUIRED)
find_package(ament_index_cpp REQUIRED)
find_package(geometry_msgs REQUIRED)

if(USE_QT6)
find_package(Qt6 REQUIRED COMPONENTS Widgets)
set(QT_VERSION_MAJOR 6)
else()
find_package(Qt5 REQUIRED COMPONENTS Widgets)
set(QT_VERSION_MAJOR 5)
endif()
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

find_package(rclcpp REQUIRED)
find_package(rclcpp_action REQUIRED)
Expand Down
7 changes: 3 additions & 4 deletions turtlesim/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
<author email="[email protected]">Michael Jeronimo</author>
<author email="[email protected]">Shane Loretz</author>

<build_depend>qt5-qmake</build_depend>
<build_depend>qtbase5-dev</build_depend>
<build_depend>qt6-base-dev</build_depend>

<buildtool_depend>ament_cmake</buildtool_depend>

<exec_depend>libqt5-core</exec_depend>
<exec_depend>libqt5-gui</exec_depend>
<exec_depend>libqt6-core</exec_depend>
<exec_depend>libqt6gui6t64</exec_depend>

<depend>ament_index_cpp</depend>
<depend>geometry_msgs</depend>
Expand Down