Skip to content

Commit 8fef8d5

Browse files
authored
Merge pull request #36 from Simple-Robotics/edantec-patch-1
Update devel-git-deps.yaml
2 parents 04fe53a + 5d6f81d commit 8fef8d5

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

README.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The **Simple-mpc** library provides:
2020
```bash
2121
mkdir -p simple-mpc_ws/src
2222
cd simple-mpc_ws/src
23-
git clone [email protected]:edantec/simple-mpc.git --recursive
23+
git clone [email protected]:Simple-Robotics/simple-mpc.git --recursive
2424
```
2525

2626
2. Create conda environment.
@@ -37,11 +37,12 @@ mamba activate simple-mpc-devel
3737
vcs import --recursive < simple-mpc/devel-git-deps.yaml
3838
```
3939

40-
4. Build all packages
40+
4. Build all dependencies of simple-mpc:
41+
(Due to a renaming issue, you may need to rename hpp-fcl into coal in the package.xml file of the Pinocchio library)
4142
```bash
4243
export MAKEFLAGS="-j4" # It is recommended to reduce the number of jobs as you ram might get full easily with the default number.
4344
cd ..
44-
colcon build --event-handlers console_direct+ --cmake-args \
45+
colcon build --event-handlers console_direct+ --packages-ignore simple-mpc --cmake-args \
4546
-DCMAKE_BUILD_TYPE=Release \
4647
-DCMAKE_PREFIX_PATH=$CONDA_PREFIX \
4748
-DPYTHON_EXECUTABLE=$(which python) \
@@ -52,11 +53,18 @@ colcon build --event-handlers console_direct+ --cmake-args \
5253
-DBUILD_BENCHMARK=OFF \
5354
-DBUILD_BENCHMARKS=OFF \
5455
-DBUILD_WITH_COLLISION_SUPPORT=ON \
55-
-DGENERATE_PYTHON_STUBS=OFF
56+
-DGENERATE_PYTHON_STUBS=OFF \
57+
-DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON
5658
```
5759

58-
5. Source the environment
59-
(This step need to be repeated every time a new shell is opened. It can be put in your ~/.bashrc)
60+
5. Source the environment and install simple-mpc:
61+
```bash
62+
source install/setup.bash
63+
colcon build --packages-select simple-mpc
64+
```
65+
66+
6. Source the environment one more time
67+
(This step needs to be repeated every time a new shell is opened. It can be put in your ~/.bashrc)
6068
```bash
6169
mamba activate simple-mpc-devel # If not already done
6270
source install/setup.bash

devel-git-deps.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ repositories:
2121
version: master
2222
pinocchio:
2323
type: git
24-
url: git@gitlab.inria.fr:jucarpen/pinocchio.git
25-
version: topic/simulation
24+
url: git@github.com:stack-of-tasks/pinocchio.git
25+
version: devel
2626
proxsuite-nlp:
2727
type: git
2828
url: [email protected]:simple-robotics/proxsuite-nlp.git

0 commit comments

Comments
 (0)