Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install executables in package specific path #173

Merged
merged 1 commit into from
Jun 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rclcpp/minimal_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ add_executable(${PROJECT_NAME}_main main.cpp)
ament_target_dependencies(${PROJECT_NAME}_main rclcpp example_interfaces)

install(TARGETS ${PROJECT_NAME}_main
DESTINATION bin)
DESTINATION lib/${PROJECT_NAME})

ament_package()
9 changes: 6 additions & 3 deletions rclcpp/minimal_composition/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,14 @@ ament_target_dependencies(${PROJECT_NAME}_composed rclcpp class_loader)

install(TARGETS
${PROJECT_NAME}_nodes
${PROJECT_NAME}_publisher
${PROJECT_NAME}_subscriber
${PROJECT_NAME}_composed
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)

install(TARGETS
${PROJECT_NAME}_publisher
${PROJECT_NAME}_subscriber
${PROJECT_NAME}_composed
DESTINATION lib/${PROJECT_NAME})

ament_package()
2 changes: 1 addition & 1 deletion rclcpp/minimal_publisher/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
${PROJECT_NAME}_not_composable
DESTINATION bin
DESTINATION lib/${PROJECT_NAME}
)

ament_package()
2 changes: 1 addition & 1 deletion rclcpp/minimal_service/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ add_executable(${PROJECT_NAME}_main main.cpp)
ament_target_dependencies(${PROJECT_NAME}_main rclcpp example_interfaces)

install(TARGETS ${PROJECT_NAME}_main
DESTINATION bin)
DESTINATION lib/${PROJECT_NAME})

ament_package()
2 changes: 1 addition & 1 deletion rclcpp/minimal_subscriber/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
${PROJECT_NAME}_not_composable
DESTINATION bin)
DESTINATION lib/${PROJECT_NAME})

ament_package()
2 changes: 1 addition & 1 deletion rclcpp/minimal_timer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ament_target_dependencies(${PROJECT_NAME}_member_function rclcpp)
install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
DESTINATION bin
DESTINATION lib/${PROJECT_NAME}
)

ament_package()
2 changes: 2 additions & 0 deletions rclpy/services/minimal_client/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
<license>Apache License 2.0</license>

<build_depend>ament_python</build_depend>

<exec_depend>example_interfaces</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>std_msgs</exec_depend>
Expand Down
6 changes: 5 additions & 1 deletion rclpy/services/minimal_client/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
from ament_python.script_dir import install_scripts_to_libexec
from setuptools import setup

package_name = 'examples_rclpy_minimal_client'
install_scripts_to_libexec(package_name)

setup(
name='examples_rclpy_minimal_client',
name=package_name,
version='0.0.0',
packages=[],
py_modules=[
Expand Down
2 changes: 2 additions & 0 deletions rclpy/services/minimal_service/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
<license>Apache License 2.0</license>

<build_depend>ament_python</build_depend>

<exec_depend>example_interfaces</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>std_msgs</exec_depend>
Expand Down
6 changes: 5 additions & 1 deletion rclpy/services/minimal_service/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
from ament_python.script_dir import install_scripts_to_libexec
from setuptools import setup

package_name = 'examples_rclpy_minimal_service'
install_scripts_to_libexec(package_name)

setup(
name='examples_rclpy_minimal_service',
name=package_name,
version='0.0.0',
packages=[],
py_modules=[
Expand Down
2 changes: 2 additions & 0 deletions rclpy/topics/minimal_publisher/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
<license>Apache License 2.0</license>

<build_depend>ament_python</build_depend>

<exec_depend>rclpy</exec_depend>
<exec_depend>std_msgs</exec_depend>

Expand Down
6 changes: 5 additions & 1 deletion rclpy/topics/minimal_publisher/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
from ament_python.script_dir import install_scripts_to_libexec
from setuptools import setup

package_name = 'examples_rclpy_minimal_publisher'
install_scripts_to_libexec(package_name)

setup(
name='examples_rclpy_minimal_publisher',
name=package_name,
version='0.0.0',
packages=[],
py_modules=[
Expand Down
2 changes: 2 additions & 0 deletions rclpy/topics/minimal_subscriber/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<maintainer email="mikael@osrfoundation.org">Mikael Arguedas</maintainer>
<license>Apache License 2.0</license>

<build_depend>ament_python</build_depend>

<exec_depend>rclpy</exec_depend>
<exec_depend>std_msgs</exec_depend>

Expand Down
6 changes: 5 additions & 1 deletion rclpy/topics/minimal_subscriber/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
from ament_python.script_dir import install_scripts_to_libexec
from setuptools import setup

package_name = 'examples_rclpy_minimal_subscriber'
install_scripts_to_libexec(package_name)

setup(
name='examples_rclpy_minimal_subscriber',
name=package_name,
version='0.0.0',
packages=[],
py_modules=[
Expand Down