Skip to content

Commit a0c7d8b

Browse files
committed
use cmake from pip
1 parent 215942b commit a0c7d8b

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

build_dependencies/install_linux.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# exit immediately on any failed step
22
set -xe
33

4+
# get cmake from pip so we can version-lock
45
pip install cmake==3.31.6
6+
# Set CMAKE variable to use the cmake in the same directory as python
7+
export CMAKE="$(dirname $(which python))/cmake"
58

6-
cmake --version
9+
$CMAKE --version
710

811
mkdir -p deps
912
cd deps
@@ -21,26 +24,26 @@ rm -rf fcl
2124
git clone --depth 1 --branch v0.7.0 https://github.com/ambi-robotics/fcl.git
2225

2326
# Install eigen
24-
cmake -B build -S eigen-3.3.9
25-
cmake --install build
27+
$CMAKE -B build -S eigen-3.3.9
28+
$CMAKE --install build
2629

2730
# Build and install libccd
2831
cd libccd
29-
cmake . -D ENABLE_DOUBLE_PRECISION=ON
32+
$CMAKE . -D ENABLE_DOUBLE_PRECISION=ON
3033
make -j4
3134
make install
3235
cd ..
3336

3437
# Build and install octomap
3538
cd octomap
36-
cmake . -D CMAKE_BUILD_TYPE=Release -D BUILD_OCTOVIS_SUBPROJECT=OFF -D BUILD_DYNAMICETD3D_SUBPROJECT=OFF
39+
$CMAKE . -D CMAKE_BUILD_TYPE=Release -D BUILD_OCTOVIS_SUBPROJECT=OFF -D BUILD_DYNAMICETD3D_SUBPROJECT=OFF
3740
make -j4
3841
make install
3942
cd ..
4043

4144
# Build and install fcl
4245
cd fcl
43-
cmake .
46+
$CMAKE .
4447
make -j4
4548
make install
4649
cd ..

build_dependencies/install_macos.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
set -xe
33
pip install cmake==3.31.6
44

5-
cmake --version
5+
# Set CMAKE variable to use the cmake in the same directory as python
6+
export CMAKE="$(dirname $(which python))/cmake"
7+
8+
$CMAKE --version
69

710
mkdir -p deps
811
cd deps
@@ -21,26 +24,26 @@ rm -rf fcl
2124
git clone --depth 1 --branch v0.7.0 https://github.com/ambi-robotics/fcl.git
2225

2326
# Install eigen
24-
cmake -B build -S eigen
25-
sudo cmake --install build
27+
$CMAKE -B build -S eigen
28+
sudo $CMAKE --install build
2629

2730
# Build and install libccd
2831
cd libccd
29-
cmake . -D ENABLE_DOUBLE_PRECISION=ON
32+
$CMAKE . -D ENABLE_DOUBLE_PRECISION=ON
3033
make -j4
3134
sudo make install
3235
cd ..
3336

3437
# Build and install octomap
3538
cd octomap
36-
cmake . -D CMAKE_BUILD_TYPE=Release -D BUILD_OCTOVIS_SUBPROJECT=OFF -D BUILD_DYNAMICETD3D_SUBPROJECT=OFF
39+
$CMAKE . -D CMAKE_BUILD_TYPE=Release -D BUILD_OCTOVIS_SUBPROJECT=OFF -D BUILD_DYNAMICETD3D_SUBPROJECT=OFF
3740
make -j4
3841
sudo make install
3942
cd ..
4043

4144
# Build and install fcl
4245
cd fcl
43-
cmake .
46+
$CMAKE .
4447
make -j4
4548
sudo make install
4649
cd ..

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ ignore = [
9797

9898

9999
[tool.cibuildwheel]
100-
skip = ["pp*", "*musllinux*"]
100+
skip = ["*musllinux*"]
101101
test-requires = "pytest"
102102
test-command = "pytest {package}/tests"
103103

0 commit comments

Comments
 (0)