Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
dynamic_graph_bridge_msgs
Commits
1fc4eb32
Commit
1fc4eb32
authored
Nov 23, 2021
by
Guilhem Saurel
Browse files
[CMake] deduplicate
parent
40c7177a
Pipeline
#16966
failed
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
1fc4eb32
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment