Fix cmake indentation

This commit is contained in:
Robert Haschke 2022-11-01 21:57:41 +01:00
parent 08dbd54a4b
commit f28b6c4ea0
9 changed files with 58 additions and 61 deletions

View File

@ -36,14 +36,14 @@ add_library(${PROJECT_NAME} SHARED
solvers/joint_interpolation.cpp
)
ament_target_dependencies(${PROJECT_NAME}
moveit_core
geometry_msgs
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_msgs
rclcpp
rviz_marker_tools
visualization_msgs
moveit_core
geometry_msgs
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_msgs
rclcpp
rviz_marker_tools
visualization_msgs
)
target_include_directories(${PROJECT_NAME}
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>

View File

@ -41,18 +41,18 @@ add_library(${PROJECT_NAME}_stages SHARED
)
target_link_libraries(${PROJECT_NAME}_stages ${PROJECT_NAME})
ament_target_dependencies(${PROJECT_NAME}_stages
moveit_core
geometry_msgs
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_msgs
rclcpp
tf2_eigen
visualization_msgs
moveit_core
geometry_msgs
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_msgs
rclcpp
tf2_eigen
visualization_msgs
)
add_library(${PROJECT_NAME}_stage_plugins SHARED
plugins.cpp
plugins.cpp
)
target_link_libraries(${PROJECT_NAME}_stage_plugins ${PROJECT_NAME}_stages)

View File

@ -6,7 +6,7 @@
if (BUILD_TESTING)
find_package(ament_cmake_gtest 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)
@ -24,16 +24,13 @@ if (BUILD_TESTING)
string(REGEX REPLACE "_" "-" TEST_NAME ${TEST_NAME})
# Configure build target
if(TEST_FILE) # Add launch test if .launch.py file was specified
ament_add_gtest_executable(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
add_launch_test(${TEST_FILE}
TARGET ${TEST_NAME}
ARGS "test_binary:=$<TARGET_FILE:${PROJECT_NAME}-${TEST_NAME}>")
else()
if("${TYPE}" STREQUAL "gtest")
ament_add_gtest(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
elseif("${TYPE}" STREQUAL "gmock")
ament_add_gmock(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
endif()
ament_add_gtest_executable(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
add_launch_test(${TEST_FILE} TARGET ${TEST_NAME}
ARGS "test_binary:=$<TARGET_FILE:${PROJECT_NAME}-${TEST_NAME}>")
elseif("${TYPE}" STREQUAL "gtest")
ament_add_gtest(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
elseif("${TYPE}" STREQUAL "gmock")
ament_add_gmock(${PROJECT_NAME}-${TEST_NAME} ${SOURCES})
endif()
target_link_libraries(${PROJECT_NAME}-${TEST_NAME} ${PROJECT_NAME} ${PROJECT_NAME}_stages gtest_utils gtest_main)
endmacro()
@ -56,7 +53,7 @@ if (BUILD_TESTING)
mtc_add_gmock(test_interface_state.cpp)
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
ament_add_gtest_executable(pick_ur5 pick_ur5.cpp)

View File

@ -17,14 +17,14 @@ find_package(rosparam_shortcuts REQUIRED)
find_package(tf2_eigen REQUIRED)
set(THIS_PACKAGE_INCLUDE_DEPENDS
moveit_core
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_core
moveit_task_constructor_msgs
rclcpp
rosparam_shortcuts
tf2_eigen
moveit_core
moveit_ros_planning
moveit_ros_planning_interface
moveit_task_constructor_core
moveit_task_constructor_msgs
rclcpp
rosparam_shortcuts
tf2_eigen
)
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
function(demo name)
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 "")
install(TARGETS ${PROJECT_NAME}_${name}
ARCHIVE DESTINATION lib
@ -58,7 +58,7 @@ demo(pick_place_demo)
target_link_libraries(${PROJECT_NAME}_pick_place_demo ${PROJECT_NAME}_pick_place_task)
install(DIRECTORY launch config
DESTINATION share/${PROJECT_NAME}
DESTINATION share/${PROJECT_NAME}
)
# TODO: Port tests

View File

@ -31,11 +31,11 @@ set(action_files
rosidl_generate_interfaces(${PROJECT_NAME}
${msg_files}
${srv_files}
${action_files}
${action_files}
DEPENDENCIES
builtin_interfaces
moveit_msgs
visualization_msgs
builtin_interfaces
moveit_msgs
visualization_msgs
)
ament_export_dependencies(rosidl_default_runtime)

View File

@ -4,22 +4,22 @@ project(rviz_marker_tools)
find_package(ament_cmake REQUIRED)
set(THIS_PACKAGE_INCLUDE_DEPENDS
eigen3_cmake_module
Eigen3
geometry_msgs
rclcpp
rviz2
tf2_eigen
urdfdom_headers
visualization_msgs
eigen3_cmake_module
Eigen3
geometry_msgs
rclcpp
rviz2
tf2_eigen
urdfdom_headers
visualization_msgs
)
foreach(dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS})
find_package(${dependency} REQUIRED)
find_package(${dependency} REQUIRED)
endforeach()
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 17)
endif()
add_library(${PROJECT_NAME} SHARED
@ -28,7 +28,7 @@ add_library(${PROJECT_NAME} SHARED
ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS})
target_include_directories(${PROJECT_NAME}
PUBLIC
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
@ -36,9 +36,9 @@ target_include_directories(${PROJECT_NAME}
install(DIRECTORY include/ DESTINATION include)
install(TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}Targets
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)
EXPORT ${PROJECT_NAME}Targets
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib)
ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})

View File

@ -27,7 +27,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 17)
endif()
add_subdirectory(visualization_tools)

View File

@ -23,8 +23,8 @@ target_include_directories(${MOVEIT_LIB_NAME}
PRIVATE ${YAML_INCLUDE_DIRS}
)
ament_target_dependencies(${MOVEIT_LIB_NAME}
moveit_task_constructor_core
rviz_common
moveit_task_constructor_core
rviz_common
)
install(TARGETS ${MOVEIT_LIB_NAME}

View File

@ -23,7 +23,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
rviz_ogre_vendor::OgreMain
)
target_include_directories(${MOVEIT_LIB_NAME}
PUBLIC include
PUBLIC include
)
ament_target_dependencies(${MOVEIT_LIB_NAME}
Boost