Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable ROBOT_TESTING under Apple Silicon macOS #1728

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Enable ROBOT_TESTING under Apple Silicon macOS #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .ci/initial-cache.gh.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/Buildblocktest-yarp-plugins.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion cmake/Buildblocktestcore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading