From ad605829bbf709ac1e2c4de7a1607c076c0216cd Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 3 Oct 2024 22:04:57 +0200 Subject: [PATCH] Enable ROBOT_TESTING under Apple Silicon macOS (#1728) --- .ci/initial-cache.gh.cmake | 4 +--- cmake/Buildblocktest-yarp-plugins.cmake | 2 +- cmake/Buildblocktestcore.cmake | 2 +- conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.ci/initial-cache.gh.cmake b/.ci/initial-cache.gh.cmake index 9ed7dae6d..465cd3181 100644 --- a/.ci/initial-cache.gh.cmake +++ b/.ci/initial-cache.gh.cmake @@ -15,9 +15,7 @@ if(NOT WIN32 OR DEFINED ENV{CONDA_PREFIX}) endif() # Profiles options -if(NOT (APPLE AND ($ENV{RUNNER_ARCH} STREQUAL "ARM64"))) - set(ROBOTOLOGY_ENABLE_ROBOT_TESTING ON CACHE BOOL "") -endif() +set(ROBOTOLOGY_ENABLE_ROBOT_TESTING ON CACHE BOOL "") set(ROBOTOLOGY_ENABLE_ICUB_HEAD ON CACHE BOOL "") set(ROBOTOLOGY_ENABLE_DYNAMICS ON CACHE BOOL "") # ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS is only supported on Windows with conda diff --git a/cmake/Buildblocktest-yarp-plugins.cmake b/cmake/Buildblocktest-yarp-plugins.cmake index 44c47b21c..803cc3342 100644 --- a/cmake/Buildblocktest-yarp-plugins.cmake +++ b/cmake/Buildblocktest-yarp-plugins.cmake @@ -18,4 +18,4 @@ ycm_ep_helper(blocktest-yarp-plugins TYPE GIT blocktestcore CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF) -set(blocktest-yarp-plugins_CONDA_DEPENDENCIES boost-cpp) +set(blocktest-yarp-plugins_CONDA_DEPENDENCIES libboost-devel) diff --git a/cmake/Buildblocktestcore.cmake b/cmake/Buildblocktestcore.cmake index e843de8bf..ed256a0d0 100644 --- a/cmake/Buildblocktestcore.cmake +++ b/cmake/Buildblocktestcore.cmake @@ -13,4 +13,4 @@ ycm_ep_helper(blocktestcore TYPE GIT CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF DEPENDS YCM) -set(blocktestcore_CONDA_DEPENDENCIES qt-main boost-cpp) +set(blocktestcore_CONDA_DEPENDENCIES qt-main libboost-devel) diff --git a/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake b/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake index d3935ed9f..f905d17f6 100644 --- a/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake +++ b/conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake @@ -134,10 +134,10 @@ macro(generate_metametadata_file) list(APPEND ${_cmake_pkg}_CONDA_DEPENDENCIES ${${_cmake_dep}_CONDA_PKG_NAME}) endforeach() - # If vtk is in the dependencies, we also need boost-cpp + # If vtk is in the dependencies, we also need libboost-devel # See https://github.com/robotology/robotology-superbuild/issues/1276 if("vtk" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES) - list(APPEND ${_cmake_pkg}_CONDA_DEPENDENCIES "boost-cpp") + list(APPEND ${_cmake_pkg}_CONDA_DEPENDENCIES "libboost-devel") endif() # Compute conda github repository