diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index 140cb48c..de2d2d6c 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -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) diff --git a/visualization/motion_planning_tasks/src/CMakeLists.txt b/visualization/motion_planning_tasks/src/CMakeLists.txt index bcb2546f..830b58c1 100644 --- a/visualization/motion_planning_tasks/src/CMakeLists.txt +++ b/visualization/motion_planning_tasks/src/CMakeLists.txt @@ -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} diff --git a/visualization/motion_planning_tasks/test/CMakeLists.txt b/visualization/motion_planning_tasks/test/CMakeLists.txt index d2417501..dbaa1fdd 100644 --- a/visualization/motion_planning_tasks/test/CMakeLists.txt +++ b/visualization/motion_planning_tasks/test/CMakeLists.txt @@ -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 diff --git a/visualization/motion_planning_tasks/utils/CMakeLists.txt b/visualization/motion_planning_tasks/utils/CMakeLists.txt index ac556444..c9de4164 100644 --- a/visualization/motion_planning_tasks/utils/CMakeLists.txt +++ b/visualization/motion_planning_tasks/utils/CMakeLists.txt @@ -12,3 +12,7 @@ target_link_libraries(${MOVEIT_LIB_NAME} target_include_directories(${MOVEIT_LIB_NAME} PUBLIC $ ) + +install(TARGETS ${MOVEIT_LIB_NAME} + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) diff --git a/visualization/package.xml b/visualization/package.xml index d472a68e..477a855c 100644 --- a/visualization/package.xml +++ b/visualization/package.xml @@ -9,16 +9,21 @@ catkin + moveit_core moveit_task_constructor_msgs moveit_task_constructor_core moveit_ros_visualization + roscpp rviz + moveit_core moveit_task_constructor_msgs moveit_task_constructor_core moveit_ros_visualization + roscpp rviz + rosunit rostest moveit_resources diff --git a/visualization/visualization_tools/CMakeLists.txt b/visualization/visualization_tools/CMakeLists.txt index e5a6ca8f..fa05e39e 100644 --- a/visualization/visualization_tools/CMakeLists.txt +++ b/visualization/visualization_tools/CMakeLists.txt @@ -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}