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 PCL dependency #42

Merged
merged 9 commits into from
Nov 10, 2023
Merged

Enable PCL dependency #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6e5ce9
Enable PCL dependency
traversaro Nov 9, 2023
b295b30
Enable PCL in build scripts
traversaro Nov 9, 2023
cfa1668
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and co…
Nov 9, 2023
cb020b8
Update meta.yaml
traversaro Nov 9, 2023
db66192
Update meta.yaml
traversaro Nov 9, 2023
b082191
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and co…
Nov 9, 2023
d6ce0b2
Update meta.yaml
traversaro Nov 9, 2023
0b13f14
Create 757.patch
traversaro Nov 10, 2023
59004b3
Update meta.yaml
traversaro Nov 10, 2023
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: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
pybind11_abi:
- '4'
python:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/libopencv481.yaml
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
fmt:
- '10'
libopencv:
Expand All @@ -24,6 +24,8 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
pybind11_abi:
- '4'
python:
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
fmt:
- '10'
libopencv:
Expand All @@ -24,6 +24,8 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
pybind11_abi:
- '4'
python:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
pugixml:
- '1.13'
pybind11_abi:
- '4'
python:
Expand Down
17 changes: 13 additions & 4 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 11 additions & 4 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions .scripts/run_win_build.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions recipe/757.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 485099e7374939eeed52e819550460b5cde3002c Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio.traversaro@iit.it>
Date: Fri, 10 Nov 2023 09:25:10 +0100
Subject: [PATCH] Add missing include(FetchContent) in
bindings/python/RobotInterface/CMakeLists.txt

---
bindings/python/RobotInterface/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)

diff --git a/bindings/python/RobotInterface/CMakeLists.txt b/bindings/python/RobotInterface/CMakeLists.txt
index aa33fc9e27..31512841b7 100644
--- a/bindings/python/RobotInterface/CMakeLists.txt
+++ b/bindings/python/RobotInterface/CMakeLists.txt
@@ -27,6 +27,7 @@ if(TARGET BipedalLocomotion::RobotInterface
# https://github.com/pybind/pybind11/commit/74a767d42921001fc4569ecee3b8726383c42ad4
# https://github.com/pybind/pybind11/pull/2864
if (${pybind11_VERSION} VERSION_GREATER_EQUAL "2.7.0")
+ include(FetchContent)
FetchContent_Declare(
cvnp
GIT_REPOSITORY https://github.com/pthom/cvnp
1 change: 1 addition & 0 deletions recipe/bld_cxx.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cmake -G "Ninja" ^
-DFRAMEWORK_USE_LieGroupControllers:BOOL=ON ^
-DFRAMEWORK_USE_UnicyclePlanner:BOOL=ON ^
-DFRAMEWORK_USE_tomlplusplus:BOOL=ON ^
-DFRAMEWORK_USE_PCL:BOOL=ON ^
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=OFF ^
%SRC_DIR%
if errorlevel 1 exit 1
Expand Down
1 change: 1 addition & 0 deletions recipe/build_cxx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cmake ${CMAKE_ARGS} -GNinja .. \
-DFRAMEWORK_USE_LieGroupControllers:BOOL=ON \
-DFRAMEWORK_USE_UnicyclePlanner:BOOL=ON \
-DFRAMEWORK_USE_tomlplusplus:BOOL=ON \
-DFRAMEWORK_USE_PCL:BOOL=ON \
-DFRAMEWORK_COMPILE_PYTHON_BINDINGS:BOOL=OFF

cat CMakeCache.txt
Expand Down
12 changes: 9 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ package:
source:
url: https://github.com/ami-iit/bipedal-locomotion-framework/archive/refs/tags/v{{ version }}.tar.gz
sha256: 129cc8f7f2d9baf144cb39d1b0927c46808387d38a4f5848a20f29507b98c9cf
patches:
- 757.patch

build:
number: 1
number: 2

outputs:
- name: {{ namecxx }}
Expand Down Expand Up @@ -55,8 +57,7 @@ outputs:
- casadi
- qhull
- libopencv
# Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/21#issuecomment-1460345952
# - pcl >1.12
- pcl >1.12
- liblie-group-controllers
- libunicycle-footstep-planner
- librealsense # [not win]
Expand Down Expand Up @@ -118,6 +119,11 @@ outputs:
- spdlog
# Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/issues/37
- libmatio-cpp
# Workaround for https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/42#issuecomment-1804057782
- casadi
- libboost
- pugixml
- pcl >1.12
- xorg-libxfixes # [linux]
- icub-models # Requested just for tests
- scipy # Requested just for tests
Expand Down