Skip to content

Commit 6105e1b

Browse files
committed
add cmake to build system dependencies
we search for MKL with cmake. Also remove pkg-config from meta.yamls and use cmake there
1 parent c12f976 commit 6105e1b

6 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/build-with-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Install mkl_umath dependencies
5757
run: |
58-
pip install meson-python ninja cython mkl-service
58+
pip install meson-python ninja cython cmake mkl-service
5959
pip install ${{ matrix.numpy_version }}
6060
6161
- name: List oneAPI folder content

.github/workflows/build-with-standard-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Install mkl_umath dependencies
4949
run: |
50-
pip install meson-python ninja cython mkl-devel
50+
pip install meson-python ninja cmake cython mkl-devel
5151
pip install ${{ matrix.numpy_version }}
5252
5353
- name: Build mkl_umath

.github/workflows/build_pip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
4949
- name: Build conda package
5050
run: |
51-
pip install --no-cache-dir meson-python ninja cython
51+
pip install --no-cache-dir meson-python ninja cmake cython
5252
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
5353
CC=icx pip install . --no-build-isolation --no-deps --verbose
5454
pip install --no-cache-dir pytest

conda-recipe-cf/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ requirements:
2424
host:
2525
- meson-python >=0.13.0
2626
- meson
27-
- pkg-config
27+
- cmake
2828
- ninja
2929
- git
3030
- cython

conda-recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ requirements:
2424
host:
2525
- meson-python >=0.13.0
2626
- meson
27-
- pkg-config
27+
- cmake
2828
- ninja
2929
- git
3030
- cython

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ requires = [
2929
"meson-python>=0.13.0",
3030
"ninja",
3131
"Cython",
32-
"numpy"
32+
"numpy",
33+
"cmake"
3334
]
3435

3536
[project]

0 commit comments

Comments
 (0)