mirror of
https://github.com/moveit/moveit_task_constructor.git
synced 2025-11-04 14:49:57 +08:00
Fix cmake indentation
This commit is contained in:
parent
08dbd54a4b
commit
f28b6c4ea0
@ -36,14 +36,14 @@ add_library(${PROJECT_NAME} SHARED
|
|||||||
solvers/joint_interpolation.cpp
|
solvers/joint_interpolation.cpp
|
||||||
)
|
)
|
||||||
ament_target_dependencies(${PROJECT_NAME}
|
ament_target_dependencies(${PROJECT_NAME}
|
||||||
moveit_core
|
moveit_core
|
||||||
geometry_msgs
|
geometry_msgs
|
||||||
moveit_ros_planning
|
moveit_ros_planning
|
||||||
moveit_ros_planning_interface
|
moveit_ros_planning_interface
|
||||||
moveit_task_constructor_msgs
|
moveit_task_constructor_msgs
|
||||||
rclcpp
|
rclcpp
|
||||||
rviz_marker_tools
|
rviz_marker_tools
|
||||||
visualization_msgs
|
visualization_msgs
|
||||||
)
|
)
|
||||||
target_include_directories(${PROJECT_NAME}
|
target_include_directories(${PROJECT_NAME}
|
||||||
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
||||||
|
|||||||
@ -41,18 +41,18 @@ add_library(${PROJECT_NAME}_stages SHARED
|
|||||||
)
|
)
|
||||||
target_link_libraries(${PROJECT_NAME}_stages ${PROJECT_NAME})
|
target_link_libraries(${PROJECT_NAME}_stages ${PROJECT_NAME})
|
||||||
ament_target_dependencies(${PROJECT_NAME}_stages
|
ament_target_dependencies(${PROJECT_NAME}_stages
|
||||||
moveit_core
|
moveit_core
|
||||||
geometry_msgs
|
geometry_msgs
|
||||||
moveit_ros_planning
|
moveit_ros_planning
|
||||||
moveit_ros_planning_interface
|
moveit_ros_planning_interface
|
||||||
moveit_task_constructor_msgs
|
moveit_task_constructor_msgs
|
||||||
rclcpp
|
rclcpp
|
||||||
tf2_eigen
|
tf2_eigen
|
||||||
visualization_msgs
|
visualization_msgs
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME}_stage_plugins SHARED
|
add_library(${PROJECT_NAME}_stage_plugins SHARED
|
||||||
plugins.cpp
|
plugins.cpp
|
||||||
)
|
)
|
||||||
target_link_libraries(${PROJECT_NAME}_stage_plugins ${PROJECT_NAME}_stages)
|
target_link_libraries(${PROJECT_NAME}_stage_plugins ${PROJECT_NAME}_stages)
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
if (BUILD_TESTING)
|
if (BUILD_TESTING)
|
||||||
find_package(ament_cmake_gtest REQUIRED)
|
find_package(ament_cmake_gtest REQUIRED)
|
||||||
find_package(ament_cmake_gmock REQUIRED)
|
find_package(ament_cmake_gmock REQUIRED)
|
||||||
find_package(launch_testing_ament_cmake REQUIRED)
|
find_package(launch_testing_ament_cmake REQUIRED)
|
||||||
|
|
||||||
add_library(gtest_utils SHARED gtest_value_printers.cpp models.cpp stage_mockups.cpp)
|
add_library(gtest_utils SHARED gtest_value_printers.cpp models.cpp stage_mockups.cpp)
|
||||||
|
|
||||||
@ -24,16 +24,13 @@ if (BUILD_TESTING)
|
|||||||
string(REGEX REPLACE "_" "-" TEST_NAME ${TEST_NAME})
|
string(REGEX REPLACE "_" "-" TEST_NAME ${TEST_NAME})
|
||||||
# Configure build target
|
# Configure build target
|
||||||
if(TEST_FILE) # Add launch test if .launch.py file was specified
|
if(TEST_FILE) # Add launch test if .launch.py file was specified
|
||||||
ament_add_gtest_executable(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
ament_add_gtest_executable(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
||||||
add_launch_test(${TEST_FILE}
|
add_launch_test(${TEST_FILE} TARGET ${TEST_NAME}
|
||||||
TARGET ${TEST_NAME}
|
ARGS "test_binary:=$<TARGET_FILE:${PROJECT_NAME}-${TEST_NAME}>")
|
||||||
ARGS "test_binary:=$<TARGET_FILE:${PROJECT_NAME}-${TEST_NAME}>")
|
elseif("${TYPE}" STREQUAL "gtest")
|
||||||
else()
|
ament_add_gtest(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
||||||
if("${TYPE}" STREQUAL "gtest")
|
elseif("${TYPE}" STREQUAL "gmock")
|
||||||
ament_add_gtest(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
ament_add_gmock(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
||||||
elseif("${TYPE}" STREQUAL "gmock")
|
|
||||||
ament_add_gmock(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
target_link_libraries(${PROJECT_NAME}-${TEST_NAME} ${PROJECT_NAME} ${PROJECT_NAME}_stages gtest_utils gtest_main)
|
target_link_libraries(${PROJECT_NAME}-${TEST_NAME} ${PROJECT_NAME} ${PROJECT_NAME}_stages gtest_utils gtest_main)
|
||||||
endmacro()
|
endmacro()
|
||||||
@ -56,7 +53,7 @@ if (BUILD_TESTING)
|
|||||||
mtc_add_gmock(test_interface_state.cpp)
|
mtc_add_gmock(test_interface_state.cpp)
|
||||||
|
|
||||||
mtc_add_gtest(test_move_to.cpp move_to.launch.py)
|
mtc_add_gtest(test_move_to.cpp move_to.launch.py)
|
||||||
mtc_add_gtest(test_move_relative.cpp move_to.launch.py)
|
mtc_add_gtest(test_move_relative.cpp move_to.launch.py)
|
||||||
|
|
||||||
# building these integration tests works without moveit config packages
|
# building these integration tests works without moveit config packages
|
||||||
ament_add_gtest_executable(pick_ur5 pick_ur5.cpp)
|
ament_add_gtest_executable(pick_ur5 pick_ur5.cpp)
|
||||||
|
|||||||
@ -17,14 +17,14 @@ find_package(rosparam_shortcuts REQUIRED)
|
|||||||
find_package(tf2_eigen REQUIRED)
|
find_package(tf2_eigen REQUIRED)
|
||||||
|
|
||||||
set(THIS_PACKAGE_INCLUDE_DEPENDS
|
set(THIS_PACKAGE_INCLUDE_DEPENDS
|
||||||
moveit_core
|
moveit_core
|
||||||
moveit_ros_planning
|
moveit_ros_planning
|
||||||
moveit_ros_planning_interface
|
moveit_ros_planning_interface
|
||||||
moveit_task_constructor_core
|
moveit_task_constructor_core
|
||||||
moveit_task_constructor_msgs
|
moveit_task_constructor_msgs
|
||||||
rclcpp
|
rclcpp
|
||||||
rosparam_shortcuts
|
rosparam_shortcuts
|
||||||
tf2_eigen
|
tf2_eigen
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME}_pick_place_task SHARED src/pick_place_task.cpp)
|
add_library(${PROJECT_NAME}_pick_place_task SHARED src/pick_place_task.cpp)
|
||||||
@ -39,7 +39,7 @@ include_directories(include)
|
|||||||
# declare a demo consisting of a single cpp file
|
# declare a demo consisting of a single cpp file
|
||||||
function(demo name)
|
function(demo name)
|
||||||
add_executable(${PROJECT_NAME}_${name} src/${name}.cpp)
|
add_executable(${PROJECT_NAME}_${name} src/${name}.cpp)
|
||||||
ament_target_dependencies(${PROJECT_NAME}_${name} ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
ament_target_dependencies(${PROJECT_NAME}_${name} ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
||||||
set_target_properties(${PROJECT_NAME}_${name} PROPERTIES OUTPUT_NAME ${name} PREFIX "")
|
set_target_properties(${PROJECT_NAME}_${name} PROPERTIES OUTPUT_NAME ${name} PREFIX "")
|
||||||
install(TARGETS ${PROJECT_NAME}_${name}
|
install(TARGETS ${PROJECT_NAME}_${name}
|
||||||
ARCHIVE DESTINATION lib
|
ARCHIVE DESTINATION lib
|
||||||
@ -58,7 +58,7 @@ demo(pick_place_demo)
|
|||||||
target_link_libraries(${PROJECT_NAME}_pick_place_demo ${PROJECT_NAME}_pick_place_task)
|
target_link_libraries(${PROJECT_NAME}_pick_place_demo ${PROJECT_NAME}_pick_place_task)
|
||||||
|
|
||||||
install(DIRECTORY launch config
|
install(DIRECTORY launch config
|
||||||
DESTINATION share/${PROJECT_NAME}
|
DESTINATION share/${PROJECT_NAME}
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: Port tests
|
# TODO: Port tests
|
||||||
|
|||||||
@ -31,11 +31,11 @@ set(action_files
|
|||||||
rosidl_generate_interfaces(${PROJECT_NAME}
|
rosidl_generate_interfaces(${PROJECT_NAME}
|
||||||
${msg_files}
|
${msg_files}
|
||||||
${srv_files}
|
${srv_files}
|
||||||
${action_files}
|
${action_files}
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
builtin_interfaces
|
builtin_interfaces
|
||||||
moveit_msgs
|
moveit_msgs
|
||||||
visualization_msgs
|
visualization_msgs
|
||||||
)
|
)
|
||||||
|
|
||||||
ament_export_dependencies(rosidl_default_runtime)
|
ament_export_dependencies(rosidl_default_runtime)
|
||||||
|
|||||||
@ -4,22 +4,22 @@ project(rviz_marker_tools)
|
|||||||
find_package(ament_cmake REQUIRED)
|
find_package(ament_cmake REQUIRED)
|
||||||
|
|
||||||
set(THIS_PACKAGE_INCLUDE_DEPENDS
|
set(THIS_PACKAGE_INCLUDE_DEPENDS
|
||||||
eigen3_cmake_module
|
eigen3_cmake_module
|
||||||
Eigen3
|
Eigen3
|
||||||
geometry_msgs
|
geometry_msgs
|
||||||
rclcpp
|
rclcpp
|
||||||
rviz2
|
rviz2
|
||||||
tf2_eigen
|
tf2_eigen
|
||||||
urdfdom_headers
|
urdfdom_headers
|
||||||
visualization_msgs
|
visualization_msgs
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach(dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
foreach(dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
||||||
find_package(${dependency} REQUIRED)
|
find_package(${dependency} REQUIRED)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if(NOT CMAKE_CXX_STANDARD)
|
if(NOT CMAKE_CXX_STANDARD)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} SHARED
|
add_library(${PROJECT_NAME} SHARED
|
||||||
@ -28,7 +28,7 @@ add_library(${PROJECT_NAME} SHARED
|
|||||||
|
|
||||||
ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS})
|
||||||
target_include_directories(${PROJECT_NAME}
|
target_include_directories(${PROJECT_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
)
|
)
|
||||||
@ -36,9 +36,9 @@ target_include_directories(${PROJECT_NAME}
|
|||||||
install(DIRECTORY include/ DESTINATION include)
|
install(DIRECTORY include/ DESTINATION include)
|
||||||
|
|
||||||
install(TARGETS ${PROJECT_NAME}
|
install(TARGETS ${PROJECT_NAME}
|
||||||
EXPORT ${PROJECT_NAME}Targets
|
EXPORT ${PROJECT_NAME}Targets
|
||||||
ARCHIVE DESTINATION lib
|
ARCHIVE DESTINATION lib
|
||||||
LIBRARY DESTINATION lib)
|
LIBRARY DESTINATION lib)
|
||||||
|
|
||||||
ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
|
ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
|
||||||
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
|
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
|
||||||
|
|||||||
@ -27,7 +27,7 @@ set(CMAKE_AUTOMOC ON)
|
|||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
||||||
if(NOT CMAKE_CXX_STANDARD)
|
if(NOT CMAKE_CXX_STANDARD)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(visualization_tools)
|
add_subdirectory(visualization_tools)
|
||||||
|
|||||||
@ -23,8 +23,8 @@ target_include_directories(${MOVEIT_LIB_NAME}
|
|||||||
PRIVATE ${YAML_INCLUDE_DIRS}
|
PRIVATE ${YAML_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
ament_target_dependencies(${MOVEIT_LIB_NAME}
|
ament_target_dependencies(${MOVEIT_LIB_NAME}
|
||||||
moveit_task_constructor_core
|
moveit_task_constructor_core
|
||||||
rviz_common
|
rviz_common
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS ${MOVEIT_LIB_NAME}
|
install(TARGETS ${MOVEIT_LIB_NAME}
|
||||||
|
|||||||
@ -23,7 +23,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
|
|||||||
rviz_ogre_vendor::OgreMain
|
rviz_ogre_vendor::OgreMain
|
||||||
)
|
)
|
||||||
target_include_directories(${MOVEIT_LIB_NAME}
|
target_include_directories(${MOVEIT_LIB_NAME}
|
||||||
PUBLIC include
|
PUBLIC include
|
||||||
)
|
)
|
||||||
ament_target_dependencies(${MOVEIT_LIB_NAME}
|
ament_target_dependencies(${MOVEIT_LIB_NAME}
|
||||||
Boost
|
Boost
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user