From 0b7a1740bf6446b7cbb0df98783bbdb82f93b693 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 30 Nov 2020 09:28:41 +0100 Subject: [PATCH] Switch to use 2020.11.yaml release file by default --- CMakeLists.txt | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 215c087aa..3042cdcda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,9 +95,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${ROBOTOLOGY_BUILD_TYPES}) endif() -set(ROBOTOLOGY_PROJECT_TAGS "Stable" CACHE STRING "The tags to be used for the robotology projects: Stable, Unstable or Custom. This can be changed only before the first configuration.") +set(ROBOTOLOGY_PROJECT_TAGS "Custom" CACHE STRING "The tags to be used for the robotology projects: Stable, Unstable or Custom. This can be changed only before the first configuration.") mark_as_advanced(ROBOTOLOGY_PROJECT_TAGS) -set(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE CACHE FILEPATH "If ROBOTOLOGY_PROJECT_TAGS is custom, this file will be loaded to specify the tags of the projects to use.") +set(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE "${CMAKE_CURRENT_SOURCE_DIR}/releases/2020.11.yaml" CACHE FILEPATH "If ROBOTOLOGY_PROJECT_TAGS is custom, this file will be loaded to specify the tags of the projects to use.") mark_as_advanced(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE) set_property(CACHE ROBOTOLOGY_PROJECT_TAGS PROPERTY STRINGS "Stable" "Unstable" "Custom") @@ -162,24 +162,26 @@ if(ROBOTOLOGY_ENABLE_DYNAMICS) find_or_build_package(walking-controllers) find_or_build_package(whole-body-estimators) find_or_build_package(whole-body-controllers) - find_or_build_package(matio-cpp) - find_or_build_package(bipedal-locomotion-framework) + # Commented out as too recent to be included in the 2020.11 installer + # find_or_build_package(matio-cpp) + # find_or_build_package(bipedal-locomotion-framework) if(ROBOTOLOGY_USES_GAZEBO) find_or_build_package(icub-gazebo-wholebody) endif() endif() -if(ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS) - find_or_build_package(manif) - find_or_build_package(qhull) - find_or_build_package(casadi) - - # cppad is currently disabled on windows - # https://github.com/robotology/robotology-superbuild-dependencies-vcpkg/pull/37 - if(NOT WIN32) - find_or_build_package(CppAD) - endif() -endif() +# Commented out as too recent to be included in the 2020.11 installer +#if(ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS) +# find_or_build_package(manif) +# find_or_build_package(qhull) +# find_or_build_package(casadi) + +# # cppad is currently disabled on windows +# # https://github.com/robotology/robotology-superbuild-dependencies-vcpkg/pull/37 +# if(NOT WIN32) +# find_or_build_package(CppAD) +# endif() +# endif() # Teleoperation if(ROBOTOLOGY_ENABLE_TELEOPERATION)