diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cf38f407..a98d75716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/cmake b/cmake index acc238a01..6b0564f45 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit acc238a01539d6a24d6383275e4d1d45296bb94b +Subproject commit 6b0564f45af29a90160aafdfd67eb7a07ace48ed 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", ] }