Commit 1fc4eb32 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] deduplicate

parent 40c7177a
Pipeline #16966 failed
......@@ -38,7 +38,6 @@ if(ROS_VERSION EQUAL 1) # if ROS1
add_library(${PROJECT_NAME} INTERFACE)
install(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
else() # if ROS2
# Here ament is doing things ok.
......@@ -54,11 +53,12 @@ else() # if ROS2
"srv/RunPythonCommand.srv"
"srv/RunPythonFile.srv"
)
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
ament_export_dependencies(rosidl_default_runtime)
ament_package()
endif()
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
if(BUILD_TESTING)
if(ROS_VERSION EQUAL 1) # if ROS1
find_package(rostest REQUIRED)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment