From b0666ce507f82a0523adc25ea6cf8b484df25517 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 27 Nov 2024 13:28:24 +0100 Subject: [PATCH] Always build yarp-ros and yarp-ros-devices after YARP 3.10 release --- cmake/RobotologySuperbuildOptions.cmake | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cmake/RobotologySuperbuildOptions.cmake b/cmake/RobotologySuperbuildOptions.cmake index df090ab2d..0e5f320d6 100644 --- a/cmake/RobotologySuperbuildOptions.cmake +++ b/cmake/RobotologySuperbuildOptions.cmake @@ -114,14 +114,10 @@ set(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE CACHE FILEPATH "If ROBOTOLOGY_PROJECT_TA set_property(CACHE ROBOTOLOGY_PROJECT_TAGS PROPERTY STRINGS "Stable" "Unstable" "LatestRelease" "Custom") -# For now, only YARP master (used in Unstable ROBOTOLOGY_PROJECT_TAGS) requires to have separate yarp-ros and yarp-ros-devices -# However, we keep ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS as a user selectable option as some users could use ROBOTOLOGY_PROJECT_TAGS set to -# Stable or a given release, and manually change the YARP to a version that does not contain yarp-ros functionality -option(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS "If ON, build yarp-ros and yarp-ros-devices repository" OFF) -if(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Unstable") - # If ROBOTOLOGY_PROJECT_TAGS is Unstable, force the value to be ON - set(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS ON CACHE BOOL "" FORCE) -endif() +# Since YARP 3.10 this requires to have separate yarp-ros and yarp-ros-devices +# However, we keep ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS as a user selectable option to easily revert to the old behaviour +option(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS "If ON, build yarp-ros and yarp-ros-devices repository" ON) +mark_as_advanced(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS) if(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Stable") include(ProjectsTagsStable)