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

Correctly generate conda packages for packages that depend on vtk #1277

Merged
merged 2 commits into from
Sep 28, 2022
+16 −1
Merged

Correctly generate conda packages for packages that depend on vtk #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8d190
Correctly generate conda packages for package that depend on vtk
traversaro Sep 27, 2022
1d82372
Update conda_build_config.yml
traversaro Sep 27, 2022
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
9 changes: 8 additions & 1 deletion conda/cmake/RobotologySuperbuildGenerateCondaRecipes.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ macro(generate_metametadata_file)
foreach(_cmake_dep IN LISTS _YH_${_cmake_pkg}_DEPENDS)
list(APPEND ${_cmake_pkg}_CONDA_DEPENDENCIES ${${_cmake_dep}_CONDA_PKG_NAME})
endforeach()

# If vtk is in the dependencies, we also need boost-cpp
# 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")
endif()

# Compute conda github repository
# We remove the trailing .git (if present)
Expand Down Expand Up @@ -208,7 +214,8 @@ macro(generate_metametadata_file)
"freeglut" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
"glew" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
"irrlicht" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
"idyntree" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES)
"idyntree" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES OR
"vtk" IN_LIST ${_cmake_pkg}_CONDA_DEPENDENCIES)
string(APPEND metametadata_file_contents " require_opengl_linux: true\n")
endif()
endif()
Expand Down
8 changes: 8 additions & 0 deletions conda/conda_build_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ qt_main:

ipopt:
- 3.14.8

# Some packages (vtk) to build require a specific version of boost but without
# any run or run_dependency
# Workaround for https://github.com/robotology/robotology-superbuild/pull/1277
boost:
- 1.78.0
boost_cpp:
- 1.78.0