Skip to content

Support Qt6 #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahcorde wants to merge 1 commit into
base: rolling
Choose a base branch
from
Open

Support Qt6 #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 21 additions & 8 deletions fuse_viz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,31 @@ find_package(tf2_geometry_msgs REQUIRED)

find_package(Eigen3 REQUIRED)
find_package(gtest_vendor)
find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Core)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Core)

message("Compiling with Qt${QT_VERSION_MAJOR}")

###########
## Build ##
###########

qt5_wrap_cpp(moc_files
include/fuse_viz/mapped_covariance_property.hpp
include/fuse_viz/pose_2d_stamped_property.hpp
include/fuse_viz/relative_pose_2d_stamped_constraint_property.hpp
include/fuse_viz/serialized_graph_display.hpp
)
if (${QT_VERSION_MAJOR} GREATER "5")
qt_standard_project_setup()
qt_wrap_cpp(moc_files
include/fuse_viz/mapped_covariance_property.hpp
include/fuse_viz/pose_2d_stamped_property.hpp
include/fuse_viz/relative_pose_2d_stamped_constraint_property.hpp
include/fuse_viz/serialized_graph_display.hpp
)
else()
qt5_wrap_cpp(moc_files
include/fuse_viz/mapped_covariance_property.hpp
include/fuse_viz/pose_2d_stamped_property.hpp
include/fuse_viz/relative_pose_2d_stamped_constraint_property.hpp
include/fuse_viz/serialized_graph_display.hpp
)
endif()

add_library(${PROJECT_NAME} SHARED
src/mapped_covariance_property.cpp
Expand All @@ -56,12 +69,12 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
rviz_common::rviz_common
rviz_rendering::rviz_rendering
tf2_geometry_msgs::tf2_geometry_msgs
Qt${QT_VERSION_MAJOR}::Widgets
)

target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
${Qt5Widgets_INCLUDE_DIRS}
)

#############
Expand Down
2 changes: 1 addition & 1 deletion fuse_viz/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<buildtool_depend>ament_cmake</buildtool_depend>

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

<depend>ament_cmake_ros</depend>
<depend>eigen</depend>
Expand Down