From 79507062b189992a2739126907c6c76f6f1f82f5 Mon Sep 17 00:00:00 2001 From: earlaud Date: Mon, 13 Jan 2025 15:35:43 +0100 Subject: [PATCH 1/4] Remove duplicate code for AMENT with jrl-cmakemodule --- CMakeLists.txt | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cf38f407..9ddb95345 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,6 +118,7 @@ option(BUILD_UTILS "Build the utils" OFF) option(BUILD_PYTHON_INTERFACE "Build the Python bindings" ON) option(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF) option(BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF) +option(BUILDING_ROS2_PACKAGE "Allow the package to be found using the AMENT system present in ros 2" ON) # ON for backward compatibility if(DEFINED BUILD_UNIT_TESTS) message( @@ -521,17 +522,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() From 56c458c665dbae84a3e9173eea8387a5b1ea217e Mon Sep 17 00:00:00 2001 From: EtienneAr <48348317+EtienneAr@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:04:07 +0100 Subject: [PATCH 2/4] [topic/ros2] ROS in capital letters Co-authored-by: Joris Vaillant --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ddb95345..3ce9aa68a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ option(BUILD_UTILS "Build the utils" OFF) option(BUILD_PYTHON_INTERFACE "Build the Python bindings" ON) option(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF) option(BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF) -option(BUILDING_ROS2_PACKAGE "Allow the package to be found using the AMENT system present in ros 2" ON) # ON for backward compatibility +option(BUILDING_ROS2_PACKAGE "Allow the package to be found using the AMENT system present in ROS 2" ON) # ON for backward compatibility if(DEFINED BUILD_UNIT_TESTS) message( From 28eb190b87aa68fcde7163c65eb5dd94715f4e4c Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Mon, 13 Jan 2025 17:12:17 +0100 Subject: [PATCH 3/4] pixi: Fix pixi.toml breaking change --- pixi.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.toml b/pixi.toml index 5a7a60390..94247d8cf 100644 --- a/pixi.toml +++ b/pixi.toml @@ -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", ] } From 484ce3f7b476daffa2ca27b41517a1c51fbfa621 Mon Sep 17 00:00:00 2001 From: earlaud Date: Mon, 13 Jan 2025 17:37:31 +0100 Subject: [PATCH 4/4] [topic/ros2] BUILDING_ROS2_PACKAGE option set to default True in latest jrl-cmakemodules release --- CMakeLists.txt | 1 - cmake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce9aa68a..a98d75716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,6 @@ option(BUILD_UTILS "Build the utils" OFF) option(BUILD_PYTHON_INTERFACE "Build the Python bindings" ON) option(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF) option(BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF) -option(BUILDING_ROS2_PACKAGE "Allow the package to be found using the AMENT system present in ROS 2" ON) # ON for backward compatibility if(DEFINED BUILD_UNIT_TESTS) message( diff --git a/cmake b/cmake index acc238a01..6b0564f45 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit acc238a01539d6a24d6383275e4d1d45296bb94b +Subproject commit 6b0564f45af29a90160aafdfd67eb7a07ace48ed