reduce catkin_lint complains in visualization

This commit is contained in:
v4hn 2017-12-08 20:56:12 +01:00
parent 9fca79e48b
commit 7319711973
6 changed files with 38 additions and 18 deletions

View File

@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 2.8.12)
project(moveit_task_constructor_visualization)
find_package(catkin REQUIRED COMPONENTS
moveit_task_constructor_msgs
moveit_task_constructor_core
moveit_core
moveit_ros_visualization
moveit_task_constructor_core
moveit_task_constructor_msgs
roscpp
rviz
)
@ -12,7 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
add_definitions(-DBOOST_MATH_DISABLE_FLOAT128)
# Qt Stuff
if(rviz_QT_VERSION VERSION_LESS "5")
if("${rviz_QT_VERSION}" VERSION_LESS "5")
find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)
include(${QT_USE_FILE})
macro(qt_wrap_ui)
@ -32,9 +34,14 @@ set(CMAKE_AUTORCC ON)
add_definitions(-DQT_NO_KEYWORDS)
catkin_package(
CATKIN_DEPENDS
moveit_core
moveit_task_constructor_msgs
roscpp
rviz
)
if (CMAKE_VERSION VERSION_LESS "3.1")
if ("${CMAKE_VERSION}" VERSION_LESS "3.1")
add_compile_options(-std=c++14)
else ()
set(CMAKE_CXX_STANDARD 14)

View File

@ -3,21 +3,24 @@ set(MOVEIT_LIB_NAME motion_planning_tasks_rviz_plugin)
qt_wrap_ui(UIC_FILES task_panel.ui)
add_library(${MOVEIT_LIB_NAME}
factory_model.cpp
job_queue.cpp
local_task_model.cpp
remote_task_model.cpp
task_list_model.cpp
meta_task_list_model.cpp
pluginlib_factory.h
plugin_init.cpp
remote_task_model.cpp
task_display.cpp
task_list_model.cpp
task_panel.cpp
task_panel_p.h
task_display.cpp
pluginlib_factory.h
factory_model.cpp
plugin_init.cpp
${UIC_FILES}
resources.qrc
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
target_link_libraries(${MOVEIT_LIB_NAME}
motion_planning_tasks_utils moveit_task_visualization_tools
${catkin_LIBRARIES} ${QT_LIBRARIES}

View File

@ -11,7 +11,7 @@ if (CATKIN_ENABLE_TESTING)
motion_planning_tasks_utils gtest_main)
if(NOT rviz_QT_VERSION VERSION_LESS "5")
if(NOT "${rviz_QT_VERSION}" VERSION_LESS "5")
# This tests uses Qt5's generic function slots
add_rostest_gtest(${PROJECT_NAME}-test-task_model test_task_model.launch test_task_model.cpp)
target_link_libraries(${PROJECT_NAME}-test-task_model

View File

@ -12,3 +12,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
target_include_directories(${MOVEIT_LIB_NAME}
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
)
install(TARGETS ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

View File

@ -9,16 +9,21 @@
<buildtool_depend>catkin</buildtool_depend>
<build_depend>moveit_core</build_depend>
<build_depend>moveit_task_constructor_msgs</build_depend>
<build_depend>moveit_task_constructor_core</build_depend>
<build_depend>moveit_ros_visualization</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>rviz</build_depend>
<run_depend>moveit_core</run_depend>
<run_depend>moveit_task_constructor_msgs</run_depend>
<run_depend>moveit_task_constructor_core</run_depend>
<run_depend>moveit_ros_visualization</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>rviz</run_depend>
<test_depend>rosunit</test_depend>
<test_depend>rostest</test_depend>
<test_depend>moveit_resources</test_depend>

View File

@ -4,17 +4,18 @@ set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/moveit/visualization_too
set(HEADERS
${PROJECT_INCLUDE}/display_solution.h
${PROJECT_INCLUDE}/task_solution_visualization.h
${PROJECT_INCLUDE}/task_solution_panel.h
${PROJECT_INCLUDE}/task_solution_visualization.h
)
add_library(${MOVEIT_LIB_NAME}
src/display_solution.cpp
src/task_solution_visualization.cpp
src/task_solution_panel.cpp
${HEADERS}
src/display_solution.cpp
src/task_solution_panel.cpp
src/task_solution_visualization.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
target_link_libraries(${MOVEIT_LIB_NAME}
${catkin_LIBRARIES}
@ -25,7 +26,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
target_include_directories(${MOVEIT_LIB_NAME} PUBLIC include)
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})
install(TARGETS ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}