Skip to content

Commit

Permalink
lint cmake
Browse files Browse the repository at this point in the history
Signed-off-by: wep21 <[email protected]>
  • Loading branch information
wep21 committed Apr 14, 2024
1 parent 8701877 commit b9e5b58
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 5 deletions.
25 changes: 21 additions & 4 deletions rviz_default_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,12 @@ if(BUILD_TESTING)
${SKIP_DISPLAY_TESTS})
if(TARGET image_display_test)
target_include_directories(image_display_test PRIVATE test)
target_link_libraries(image_display_test ${TEST_FIXTURE_WITH_MOCK_LIBRARIES} Qt${QT_VERSION_MAJOR}::Widgets rviz_default_plugins ogre_testing_environment)
target_link_libraries(image_display_test
${TEST_FIXTURE_WITH_MOCK_LIBRARIES}
Qt${QT_VERSION_MAJOR}::Widgets
rviz_default_plugins
ogre_testing_environment
)
endif()

add_library(marker_messages STATIC test/rviz_default_plugins/displays/marker/marker_messages.cpp)
Expand Down Expand Up @@ -775,7 +780,11 @@ if(BUILD_TESTING)
endif()

add_library(point_cloud_common_page_object STATIC test/rviz_default_plugins/page_objects/point_cloud_common_page_object.cpp)
target_link_libraries(point_cloud_common_page_object PRIVATE Qt${QT_VERSION_MAJOR}::Test rviz_visual_testing_framework::rviz_visual_testing_framework)
target_link_libraries(point_cloud_common_page_object
PRIVATE
Qt${QT_VERSION_MAJOR}::Test
rviz_visual_testing_framework::rviz_visual_testing_framework
)

ament_add_gtest(camera_display_visual_test
test/rviz_default_plugins/displays/camera/camera_display_visual_test.cpp
Expand Down Expand Up @@ -922,7 +931,11 @@ if(BUILD_TESTING)
endif()

add_library(marker_display_page_object STATIC test/rviz_default_plugins/page_objects/marker_display_page_object.cpp)
target_link_libraries(marker_display_page_object PRIVATE Qt${QT_VERSION_MAJOR}::Widgets rviz_visual_testing_framework::rviz_visual_testing_framework)
target_link_libraries(marker_display_page_object
PRIVATE
Qt${QT_VERSION_MAJOR}::Widgets
rviz_visual_testing_framework::rviz_visual_testing_framework
)

ament_add_gtest(map_display_visual_test
test/rviz_default_plugins/displays/map/map_display_visual_test.cpp
Expand Down Expand Up @@ -1060,7 +1073,11 @@ if(BUILD_TESTING)
endif()

add_library(pose_display_page_object STATIC test/rviz_default_plugins/page_objects/pose_display_page_object.cpp)
target_link_libraries(pose_display_page_object PRIVATE Qt${QT_VERSION_MAJOR}::Widgets rviz_visual_testing_framework::rviz_visual_testing_framework)
target_link_libraries(pose_display_page_object
PRIVATE
Qt${QT_VERSION_MAJOR}::Widgets
rviz_visual_testing_framework::rviz_visual_testing_framework
)

ament_add_gtest(pose_array_display_visual_test
test/rviz_default_plugins/displays/pose_array/pose_array_display_visual_test.cpp
Expand Down
13 changes: 12 additions & 1 deletion rviz_visual_testing_framework/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,18 @@ target_link_libraries(rviz_visual_testing_framework PUBLIC
)

# export information to downstream packages
ament_export_dependencies(geometry_msgs Qt${QT_VERSION_MAJOR} rclcpp rcutils rviz_common rviz_ogre_vendor rviz_rendering std_msgs tf2 tf2_ros)
ament_export_dependencies(
geometry_msgs
Qt${QT_VERSION_MAJOR}
rclcpp
rcutils
rviz_common
rviz_ogre_vendor
rviz_rendering
std_msgs
tf2
tf2_ros
)

# Export old-style CMake variables
ament_export_include_directories("include/${PROJECT_NAME}")
Expand Down

0 comments on commit b9e5b58

Please sign in to comment.