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 compilation of Python bindings of manif and bipedal-locomotion-framework also on Windows #838

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Enable compilation of Python bindings of manif and bipedal-locomotion-framework also on Windows #838

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
f3beec6
Enable compilation of Python bindings of bipedal-locomotion-framework…
traversaro Jul 27, 2021
1ba0730
Update Buildbipedal-locomotion-framework.cmake
traversaro Aug 25, 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
14 changes: 2 additions & 12 deletions cmake/Buildbipedal-locomotion-framework.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ if(ROBOTOLOGY_USES_PYTHON AND ROBOTOLOGY_GENERATE_CONDA_RECIPES)
list(APPEND bipedal-locomotion-framework_OPTIONAL_CMAKE_ARGS "-DFRAMEWORK_DETECT_ACTIVE_PYTHON_SITEPACKAGES:BOOL=ON")
endif()

# Workaround for https://github.com/robotology/robotology-superbuild/issues/802
if(ROBOTOLOGY_USES_PYTHON AND NOT WIN32)
set(BUILD_PYTHON_BINDINGS ON)
else()
set(BUILD_PYTHON_BINDINGS OFF)
endif()

ycm_ep_helper(bipedal-locomotion-framework TYPE GIT
STYLE GITHUB
REPOSITORY dic-iit/bipedal-locomotion-framework.git
Expand All @@ -61,7 +54,7 @@ ycm_ep_helper(bipedal-locomotion-framework TYPE GIT
-DFRAMEWORK_USE_cppad:BOOL=${ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS}
-DFRAMEWORK_USE_casadi:BOOL=${ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS}
-DFRAMEWORK_USE_LieGroupControllers:BOOL=${ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS}
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=${BUILD_PYTHON_BINDINGS}
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=${ROBOTOLOGY_USES_PYTHON}
${bipedal-locomotion-framework_OPTIONAL_CMAKE_ARGS}
DEPENDS ${bipedal-locomotion-framework_DEPENDS})

Expand All @@ -75,8 +68,5 @@ if(ROBOTOLOGY_USES_PYTHON)
list(APPEND bipedal-locomotion-framework_CONDA_DEPENDENCIES pybind11-abi)
list(APPEND bipedal-locomotion-framework_CONDA_DEPENDENCIES python)
list(APPEND bipedal-locomotion-framework_CONDA_DEPENDENCIES numpy)
# manifpy is not available on Windows on conda-forge, see https://github.com/conda-forge/manif-feedstock/issues/7
if(NOT WIN32)
list(APPEND bipedal-locomotion-framework_CONDA_DEPENDENCIES manifpy)
endif()
list(APPEND bipedal-locomotion-framework_CONDA_DEPENDENCIES manifpy)
endif()
2 changes: 1 addition & 1 deletion cmake/Buildmanif.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

include(YCMEPHelper)

# Workaround for https://github.com/robotology/robotology-superbuild/issues/802
# Workaround for https://github.com/robotology/robotology-superbuild/pull/838#issuecomment-887367047
if(ROBOTOLOGY_USES_PYTHON AND NOT WIN32)
set(BUILD_PYTHON_BINDINGS ON)
else()
Expand Down