diff --git a/recipe/891.patch b/recipe/891.patch deleted file mode 100644 index b1b0792..0000000 --- a/recipe/891.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 82d62d26d5a7f3d17731f4c6471f5de08ca387a3 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Fri, 20 Sep 2024 16:51:26 +0200 -Subject: [PATCH] Add USE_SYSTEM_tiny-process-library option to use - tiny-process-library found in system - ---- - devices/YarpRobotLoggerDevice/CMakeLists.txt | 43 +++++++++++--------- - 1 file changed, 23 insertions(+), 20 deletions(-) - -diff --git a/devices/YarpRobotLoggerDevice/CMakeLists.txt b/devices/YarpRobotLoggerDevice/CMakeLists.txt -index 38844d6a23..6f05fd5074 100644 ---- a/devices/YarpRobotLoggerDevice/CMakeLists.txt -+++ b/devices/YarpRobotLoggerDevice/CMakeLists.txt -@@ -3,35 +3,38 @@ - # BSD-3-Clause license. - - if(FRAMEWORK_COMPILE_YarpRobotLoggerDevice) -- # Warning: the option of yarp_configure_plugins_installation should be different from the plugin name -- -+ option(USE_SYSTEM_tiny-process-library "Use system tiny-process-library" OFF) - -- include(FetchContent) -- FetchContent_Declare(tiny_process_library -- GIT_REPOSITORY https://gitlab.com/eidheim/tiny-process-library.git -- GIT_TAG v2.0.4) -+ if(USE_SYSTEM_tiny-process-library) -+ find_package(tiny-process-library REQUIRED) -+ else() -+ include(FetchContent) -+ FetchContent_Declare(tiny_process_library -+ GIT_REPOSITORY https://gitlab.com/eidheim/tiny-process-library.git -+ GIT_TAG v2.0.4) - -- if(NOT tiny_process_library_POPULATED) -- FetchContent_Populate(tiny_process_library) -+ if(NOT tiny_process_library_POPULATED) -+ FetchContent_Populate(tiny_process_library) - -- set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) -- set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build libraries as shared as opposed to static") -+ set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS}) -+ set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "Build libraries as shared as opposed to static") - -- set(BUILD_TESTING_OLD ${BUILD_TESTING}) -- set(BUILD_TESTING OFF CACHE INTERNAL "Create tests using CMake") -+ set(BUILD_TESTING_OLD ${BUILD_TESTING}) -+ set(BUILD_TESTING OFF CACHE INTERNAL "Create tests using CMake") - -- # Bring the populated content into the build -- add_subdirectory(${tiny_process_library_SOURCE_DIR} ${tiny_process_library_BINARY_DIR}) -+ # Bring the populated content into the build -+ add_subdirectory(${tiny_process_library_SOURCE_DIR} ${tiny_process_library_BINARY_DIR}) - -- # Restore the old value of the parameter -- set(BUILD_TESTING ${BUILD_TESTING_OLD} CACHE BOOL -- "Create tests using CMake" FORCE) -+ # Restore the old value of the parameter -+ set(BUILD_TESTING ${BUILD_TESTING_OLD} CACHE BOOL -+ "Create tests using CMake" FORCE) - -- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE BOOL -- "Build libraries as shared as opposed to static" FORCE) -+ set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD} CACHE BOOL -+ "Build libraries as shared as opposed to static" FORCE) -+ endif() - endif() - -- -+ # Warning: the option of yarp_configure_plugins_installation should be different from the plugin name - add_bipedal_yarp_device( - NAME YarpRobotLoggerDevice - TYPE BipedalLocomotion::YarpRobotLoggerDevice diff --git a/recipe/898.patch b/recipe/898.patch deleted file mode 100644 index 03f8c6c..0000000 --- a/recipe/898.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ReducedModelControllers/src/CentroidalMPC.cpp b/src/ReducedModelControllers/src/CentroidalMPC.cpp -index ef265ed464..81d05145ba 100644 ---- a/src/ReducedModelControllers/src/CentroidalMPC.cpp -+++ b/src/ReducedModelControllers/src/CentroidalMPC.cpp -@@ -940,7 +940,7 @@ struct CentroidalMPC::Impl - 0 <= casadi::MX::mtimes(casadi::MX::reshape(contact.orientation(Sl(), i), - 3, - 3), -- corner.force(Sl(), i)(2))); -+ corner.force(Sl(), i))(2)); - } - } - } diff --git a/recipe/914.patch b/recipe/914.patch deleted file mode 100644 index f58c39a..0000000 --- a/recipe/914.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a57b72248da70e3959c2e9235e167c03b431917e Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Thu, 28 Nov 2024 14:08:30 +0100 -Subject: [PATCH] Add option FRAMEWORK_COMPILE_Ros1Publisher and deprecate - BipedalLocomotion::YarpUtilities::RosPublisher class - ---- - cmake/BipedalLocomotionFrameworkDependencies.cmake | 4 ++++ - .../examples/ROSPublisherTestDevice/CMakeLists.txt | 2 +- - src/YarpUtilities/CMakeLists.txt | 11 +++++++++-- - .../BipedalLocomotion/YarpUtilities/RosPublisher.h | 2 +- - 5 files changed, 17 insertions(+), 4 deletions(-) - ---- a/cmake/BipedalLocomotionFrameworkDependencies.cmake -+++ b/cmake/BipedalLocomotionFrameworkDependencies.cmake -@@ -141,6 +141,10 @@ framework_dependent_option(FRAMEWORK_COMPILE_YarpUtilities - "Compile YarpHelper library?" ON - "FRAMEWORK_USE_YARP" OFF) - -+framework_dependent_option(FRAMEWORK_COMPILE_Ros1Publisher -+ "Compile YarpUtilities::RosPublisher class?" ON -+ "FRAMEWORK_USE_YARP" OFF) -+ - framework_dependent_option(FRAMEWORK_COMPILE_RosImplementation - "Compile All the ROS implementations?" ON - "FRAMEWORK_USE_rclcpp" OFF) -diff --git a/devices/examples/ROSPublisherTestDevice/CMakeLists.txt b/devices/examples/ROSPublisherTestDevice/CMakeLists.txt -index b53eb61552..88bce95198 100644 ---- a/devices/examples/ROSPublisherTestDevice/CMakeLists.txt -+++ b/devices/examples/ROSPublisherTestDevice/CMakeLists.txt -@@ -2,7 +2,7 @@ - # This software may be modified and distributed under the terms of the - # BSD-3-Clause license. - --if(FRAMEWORK_COMPILE_YarpImplementation AND FRAMEWORK_COMPILE_YarpUtilities) -+if(FRAMEWORK_COMPILE_YarpImplementation AND FRAMEWORK_COMPILE_YarpUtilities AND FRAMEWORK_COMPILE_Ros1Publisher) - # Warning: the option of yarp_configure_plugins_installation should be different from the plugin name - add_bipedal_yarp_device( - NAME ROSPublisherTestDevice -diff --git a/src/YarpUtilities/CMakeLists.txt b/src/YarpUtilities/CMakeLists.txt -index 4cc96a8d3e..0278fc0f80 100644 ---- a/src/YarpUtilities/CMakeLists.txt -+++ b/src/YarpUtilities/CMakeLists.txt -@@ -5,10 +5,17 @@ - # set target name - if(FRAMEWORK_COMPILE_YarpUtilities) - -+ set(YarpUtilities_Ros1Publisher_PUBLIC_HEADERS "") -+ set(YarpUtilities_Ros1Publisher_SOURCES "") -+ if(FRAMEWORK_COMPILE_Ros1Publisher) -+ list(APPEND YarpUtilities_Ros1Publisher_PUBLIC_HEADERS "include/BipedalLocomotion/YarpUtilities/RosPublisher.h") -+ list(APPEND YarpUtilities_Ros1Publisher_SOURCES "src/RosPublisher.cpp") -+ endif() -+ - add_bipedal_locomotion_library( - NAME YarpUtilities -- SOURCES src/Helper.cpp src/RosPublisher.cpp -- PUBLIC_HEADERS include/BipedalLocomotion/YarpUtilities/Helper.h include/BipedalLocomotion/YarpUtilities/Helper.tpp include/BipedalLocomotion/YarpUtilities/RosPublisher.h -+ SOURCES src/Helper.cpp -+ PUBLIC_HEADERS include/BipedalLocomotion/YarpUtilities/Helper.h include/BipedalLocomotion/YarpUtilities/Helper.tpp ${YarpUtilities_Ros1Publisher_PUBLIC_HEADERS} - PUBLIC_LINK_LIBRARIES ${YARP_LIBRARIES} ${iDynTree_LIBRARIES} BipedalLocomotion::GenericContainer BipedalLocomotion::ParametersHandler BipedalLocomotion::TextLogging - SUBDIRECTORIES tests) - -diff --git a/src/YarpUtilities/include/BipedalLocomotion/YarpUtilities/RosPublisher.h b/src/YarpUtilities/include/BipedalLocomotion/YarpUtilities/RosPublisher.h -index 26134f3fed..26cfb801e7 100644 ---- a/src/YarpUtilities/include/BipedalLocomotion/YarpUtilities/RosPublisher.h -+++ b/src/YarpUtilities/include/BipedalLocomotion/YarpUtilities/RosPublisher.h -@@ -30,7 +30,7 @@ namespace YarpUtilities - * - Transform broadcaster - * Although the class might be ROS independent, in order to run the code, ROS is required and usual YARP-ROS connections need to be made. - */ --class RosPublisher -+class [[deprecated("The ROS 1-based BipedalLocomotion::YarpUtilities::RosPublisher is deprecated, use ROS 2 instead.")]] RosPublisher - { - public: - /** diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh index afc5168..a0228b3 100755 --- a/recipe/build_cxx.sh +++ b/recipe/build_cxx.sh @@ -46,5 +46,6 @@ cmake --build . --config Release --target install if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR:-}" != "" ]]; then # QPInverseKinematicsUnitTests excluded as a workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/issues/29 - ctest --output-on-failure -E QPInverseKinematicsUnitTests -C Release + # excluded as a workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/102#issuecomment-2645529914 + ctest --output-on-failure -E "QPInverseKinematicsUnitTests|YarpRobotLoggerDeviceUnitTests" -C Release fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f425894..a03c440 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ {% set name = "bipedal-locomotion-framework" %} {% set namecxx = "libbipedal-locomotion-framework" %} {% set namepython = "bipedal-locomotion-framework-python" %} -{% set version = "0.19.0" %} +{% set version = "0.20.0" %} package: name: bipedal-locomotion-framework-split @@ -11,14 +11,11 @@ package: source: url: https://github.com/ami-iit/bipedal-locomotion-framework/archive/refs/tags/v{{ version }}.tar.gz - sha256: 0366fb751aaac0ec0a2cb8ef6d56af4527b822b80d104d747f9c1c1f77718282 - patches: - - 891.patch - - 898.patch - - 914.patch + sha256: 48234c13d46fba6dacd8df88bd20dea16d489f7203a845204deafec2d4e9f633 + build: - number: 9 + number: 0 outputs: # {{ namecxx }}