Skip to content

Commit

Permalink
Merge pull request #2554 from EtienneAr/topic/ament-ros2
Browse files Browse the repository at this point in the history
Remove small code duplication in CMakelists.txt for ROS2/Ament packaging
  • Loading branch information
jorisv authored Jan 13, 2025
2 parents 6acfc6b + 484ce3f commit fbeeb0b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
12 changes: 0 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -521,17 +521,5 @@ pkg_config_append_cflags("${CFLAGS_OPTIONS}")

# Install catkin package.xml
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
# Allows Colcon to find non-Ament packages when using workspace underlays
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME}
DESTINATION share/ament_index/resource_index/packages)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv
"prepend-non-duplicate;AMENT_PREFIX_PATH;")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv
DESTINATION share/${PROJECT_NAME}/hook)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv
"prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv
DESTINATION share/${PROJECT_NAME}/hook)

setup_project_finalize()
2 changes: 1 addition & 1 deletion cmake
4 changes: 2 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ configure = { cmd = [
"-DBUILD_WITH_SDF_SUPPORT=$PINOCCHIO_SDF_SUPPORT",
"-DBUILD_PYTHON_BINDINGS_WITH_BOOST_MPFR_SUPPORT=$PINOCCHIO_MPFR_SUPPORT",
] }
build = { cmd = "cmake --build build --target all", depends_on = ["configure"] }
build = { cmd = "cmake --build build --target all", depends-on = ["configure"] }
clean = { cmd = "rm -rf build" }
test = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [
test = { cmd = "ctest --test-dir build --output-on-failure", depends-on = [
"build",
] }

Expand Down

0 comments on commit fbeeb0b

Please sign in to comment.