Skip to content

Commit 2008a27

Browse files
committed
Merge branch 'master' of github.com:mikedh/python-fcl
2 parents 68b531f + 2f9ddde commit 2008a27

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# exit immediately on any failed step
22
set -xe
3+
pip install cmake
34

45
mkdir -p deps
56
cd deps
67

78
curl -OL https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz
89
tar -zxf eigen-3.3.9.tar.gz
10+
mv eigen-3.3.9 eigen
911

1012
rm -rf libccd
1113
git clone --depth 1 --branch v2.1 https://github.com/danfis/libccd.git
@@ -17,28 +19,28 @@ rm -rf fcl
1719
git clone --depth 1 --branch v0.7.0 https://github.com/ambi-robotics/fcl.git
1820

1921
# Install eigen
20-
cmake -B build -S eigen-3.3.9
21-
cmake --install build
22+
cmake -B build -S eigen
23+
sudo cmake --install build
2224

2325
# Build and install libccd
2426
cd libccd
2527
cmake . -D ENABLE_DOUBLE_PRECISION=ON
2628
make -j4
27-
make install
29+
sudo make install
2830
cd ..
2931

3032
# Build and install octomap
3133
cd octomap
3234
cmake . -D CMAKE_BUILD_TYPE=Release -D BUILD_OCTOVIS_SUBPROJECT=OFF -D BUILD_DYNAMICETD3D_SUBPROJECT=OFF
3335
make -j4
34-
make install
36+
sudo make install
3537
cd ..
3638

3739
# Build and install fcl
3840
cd fcl
3941
cmake .
4042
make -j4
41-
make install
43+
sudo make install
4244
cd ..
4345

4446
cd ..

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ archs = ["x86_64"]
107107

108108
[tool.cibuildwheel.macos]
109109
before-all = "bash build_dependencies/install_macos.sh"
110-
environment = { CPATH = "$(brew --prefix)/include:$(brew --prefix)/include/eigen3", LD_LIBRARY_PATH = "$(brew --prefix)/lib" }
111110
repair-wheel-command = "delocate-wheel -w {dest_dir} -v {wheel}"
112111

113112
[tool.cibuildwheel.windows]

0 commit comments

Comments
 (0)