Skip to content

Commit be406a2

Browse files
author
Stephanie Eng
committed
Update to Qt6 and hope
1 parent e59b3f8 commit be406a2

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

moveit_ros/visualization/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ moveit_package()
1010
add_definitions(-DBOOST_MATH_DISABLE_FLOAT128)
1111

1212
find_package(ament_cmake REQUIRED)
13+
14+
find_package(Qt6 REQUIRED Core Widgets)
15+
set(QT_LIBRARIES Qt6::Widgets)
16+
macro(QT_WRAP_UI)
17+
qt6_wrap_ui(${ARGN})
18+
endmacro()
19+
1320
find_package(class_loader REQUIRED)
1421
find_package(geometric_shapes REQUIRED)
1522
find_package(interactive_markers REQUIRED)
@@ -38,13 +45,6 @@ find_package(rviz_ogre_vendor REQUIRED)
3845
include(ConfigExtras.cmake)
3946

4047
# Qt Stuff
41-
find_package(Qt5 ${rviz_QT_VERSION} REQUIRED Core Widgets)
42-
set(QT_LIBRARIES Qt5::Widgets)
43-
# Delegate to QT5 macro
44-
macro(QT_WRAP_UI)
45-
qt5_wrap_ui(${ARGN})
46-
endmacro()
47-
4848
set(CMAKE_INCLUDE_CURRENT_DIR ON)
4949
set(CMAKE_AUTOMOC ON)
5050
set(CMAKE_AUTORCC ON)

0 commit comments

Comments
 (0)