Skip to content

Commit b112001

Browse files
authored
Merge pull request #4320 from t20100/meson
self-merging since multiple PRs relies on this one. @kif, still interested in your review
2 parents aecbe54 + 5328ac2 commit b112001

File tree

95 files changed

+138
-1682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+138
-1682
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ jobs:
1818
- uses: actions/setup-python@v5
1919
with:
2020
python-version: "3.12"
21+
cache: "pip"
22+
- name: Build wheel
23+
run: |
24+
pip install --upgrade build
25+
python -m build --wheel
26+
ls dist
2127
- name: Check meson.build files
2228
run: |
23-
python ./tools/check_meson.py
29+
python ./tools/check_meson.py dist/silx-*.whl
2430
2531
build:
2632
name: "Python ${{ matrix.python-version }} on ${{ matrix.os }} ${{ matrix.QT_API }}"

meson.build

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project('silx',
88
)
99

1010
py_mod = import('python')
11-
py = py_mod.find_installation()
11+
py = py_mod.find_installation(pure: false)
1212
os = import('fs')
1313

1414
# Seek the backend
@@ -24,16 +24,12 @@ endif
2424

2525
# How to disable OpenMP:
2626
# The 'SILX_WITH_OPENMP' file should contain 'False'
27-
if os.is_file('SILX_WITH_OPENMP')
28-
openmp_var = os.read('SILX_WITH_OPENMP').strip()
27+
res = run_command(py, '-c', 'import os; print(os.environ["SILX_WITH_OPENMP"])',
28+
check:false)
29+
if res.returncode() == 0
30+
openmp_var = res.stdout().strip()
2931
else
30-
res = run_command(py, '-c', 'import os; print(os.environ["SILX_WITH_OPENMP"])',
31-
check:false)
32-
if res.returncode() == 0
33-
openmp_var = res.stdout().strip()
34-
else
35-
openmp_var = ''
36-
endif
32+
openmp_var = ''
3733
endif
3834
omp = dependency('openmp', required: get_option('use_openmp').disable_auto_if(openmp_var=='False'))
3935

@@ -52,4 +48,7 @@ endif
5248
py_dep = py.dependency()
5349

5450

51+
silx_dir = py.get_install_dir() / 'silx'
52+
5553
subdir('src/silx')
54+
install_subdir('examples', install_dir: silx_dir)

src/silx/app/compare/meson.build

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/silx/app/compare/test/meson.build

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/silx/app/meson.build

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/silx/app/test/meson.build

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/silx/app/utils/meson.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/silx/app/utils/test/meson.build

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/silx/app/view/meson.build

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/silx/app/view/test/meson.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/silx/gui/_glutils/meson.build

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/silx/gui/_glutils/test/meson.build

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/silx/gui/data/meson.build

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/silx/gui/data/test/meson.build

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/silx/gui/dialog/meson.build

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/silx/gui/dialog/test/meson.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/silx/gui/fit/meson.build

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/silx/gui/fit/test/meson.build

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/silx/gui/hdf5/meson.build

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/silx/gui/hdf5/test/meson.build

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/silx/gui/meson.build

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/silx/gui/plot/_utils/meson.build

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/silx/gui/plot/_utils/test/meson.build

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/silx/gui/plot/actions/meson.build

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/silx/gui/plot/backends/glutils/meson.build

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/silx/gui/plot/backends/meson.build

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)