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

OsqpEigen, YCM and robot-testing-framework: Switch to use conda-forge binary package when generating conda packages #807

Merged
merged 9 commits into from
Jun 28, 2021
Merged

OsqpEigen, YCM and robot-testing-framework: Switch to use conda-forge binary package when generating conda packages #807

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f5efba
OsqpEigen: Switch to use conda-forge binary package when generating c…
traversaro Jun 25, 2021
c684917
Update generate-conda-packages.yaml
traversaro Jun 25, 2021
2b462f6
Update Buildevent-driven.cmake
traversaro Jun 25, 2021
d52e48d
Update RobotologySuperbuildGenerateCondaRecipes.cmake
traversaro Jun 26, 2021
95db9d3
Update generate-conda-packages.yaml
traversaro Jun 26, 2021
6900ca8
Update generate-conda-packages.yaml
traversaro Jun 26, 2021
9083ac4
Update BuildRobotTestingFramework.cmake
traversaro Jun 26, 2021
62ac825
Update RobotologySuperbuildGenerateCondaRecipes.cmake
traversaro Jun 28, 2021
7b6dfd6
Update meta.yaml
traversaro Jun 28, 2021
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
3 changes: 0 additions & 3 deletions .github/workflows/generate-conda-packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ jobs:
# We manually specify the build order as conda build is too slow, and conda mambabuild does not support correctly multiple recipes
# see https://github.com/mamba-org/boa/issues/117
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml blockfactory
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml osqp-eigen
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml ycm-cmake-modules
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml robot-testing-framework
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml yarp
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml matio-cpp
conda mambabuild -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml yarp-telemetry
Expand Down
3 changes: 2 additions & 1 deletion cmake/BuildOsqpEigen.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ ycm_ep_helper(OsqpEigen TYPE GIT
CMAKE_ARGS -DBUILD_TESTING:BOOL=OFF
DEPENDS osqp)

set(OsqpEigen_CONDA_DEPENDENCIES "eigen")
set(OsqpEigen_CONDA_PKG_NAME osqp-eigen)
set(OsqpEigen_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
2 changes: 2 additions & 0 deletions cmake/BuildRobotTestingFramework.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ ycm_ep_helper(RobotTestingFramework TYPE GIT
COMPONENT core
FOLDER src)

set(RobotTestingFramework_CONDA_PKG_NAME robot-testing-framework)
set(RobotTestingFramework_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)
2 changes: 2 additions & 0 deletions cmake/Buildevent-driven.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ ycm_ep_helper(event-driven TYPE GIT
YCM
COMPONENT event-driven
FOLDER src)

set(event-driven_CONDA_DEPENDENCIES libopencv qt)
1 change: 1 addition & 0 deletions conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ set_property(GLOBAL PROPERTY YCM_PROJECTS ${_projects})
set(_YH_YCM_REPOSITORY robotology/ycm.git)
# Use ycm-cmake-modules as name as in debian
set(YCM_CONDA_PKG_NAME ycm-cmake-modules)
set(YCM_CONDA_PKG_CONDA_FORGE_OVERRIDE ON)

include(RobotologySuperbuildLogic)
include(CondaGenerationOptions)
Expand Down