Skip to content

Commit 7e124d1

Browse files
authored
Merge pull request #292 from wxmerkt/topic/ros2-integration
ROS2/Colcon integration for AMENT_PREFIX_PATH and PYTHONPATH
2 parents 4f6812d + 311d283 commit 7e124d1

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@ install(FILES package.xml DESTINATION share/eigenpy)
239239
# Allows Colcon to find non-Ament packages when using workspace underlays
240240
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "")
241241
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} DESTINATION share/ament_index/resource_index/packages)
242+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv "prepend-non-duplicate;AMENT_PREFIX_PATH;")
243+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
244+
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}")
245+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv DESTINATION share/${PROJECT_NAME}/hook)
242246

243247
# ----------------------------------------------------
244248
# --- PYTHON LIBRARY ---------------------------------

cmake

Submodule cmake updated 1 file

colcon.pkg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"hooks": [
3+
"share/eigenpy/hook/ament_prefix_path.dsv",
4+
"share/eigenpy/hook/python_path.dsv"
5+
]
6+
}

0 commit comments

Comments
 (0)