Skip to content

Commit 18b9823

Browse files
committed
Fix meson build
1 parent 26ece14 commit 18b9823

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

meson.build

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ project(
33
'c', 'cpp', 'cython',
44
# Note that the git commit hash cannot be added dynamically here
55
# That only happens when importing from a git repository.
6-
# See `skimage/__init__.py`
7-
version: run_command('skimage/_build_utils/version.py', check: true).stdout().strip(),
6+
# See `src/skimage/__init__.py`
7+
version: run_command('src/skimage/_build_utils/version.py', check: true).stdout().strip(),
88
license: 'BSD-3',
99
meson_version: '>= 1.5.0',
1010
default_options: [
@@ -47,7 +47,7 @@ endif
4747
# use a linker script to avoid exporting those symbols (this is in addition to
4848
# Meson using `-fvisibility=hidden` for C and `-fvisibility-inlines-hidden` for
4949
# C++ code. See gh-15996 for details.
50-
_linker_script = meson.project_source_root() / 'skimage/_build_utils/link-version-pyinit.map'
50+
_linker_script = meson.project_source_root() / 'src/skimage/_build_utils/link-version-pyinit.map'
5151
version_link_args = ['-Wl,--version-script=' + _linker_script]
5252
# Note that FreeBSD only accepts version scripts when -shared is passed,
5353
# hence we need to pass that to `cc.links` explicitly (flag is already
@@ -58,8 +58,8 @@ endif
5858

5959
cython = find_program('cython')
6060
pythran = find_program('pythran')
61-
tempita = files('skimage/_build_utils/tempita.py')
62-
copier = find_program(['cp', 'skimage/_build_utils/copyfiles.py'])
61+
tempita = files('src/skimage/_build_utils/tempita.py')
62+
copier = find_program(['cp', 'src/skimage/_build_utils/copyfiles.py'])
6363

6464
# https://mesonbuild.com/Python-module.html
6565
py_mod = import('python')
@@ -68,4 +68,4 @@ py_mod = import('python')
6868
py3 = py_mod.find_installation()
6969
py3_dep = py3.dependency()
7070

71-
subdir('skimage')
71+
subdir('src')

src/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
subdir('skimage')
2+
subdir('skimage2')

src/skimage2/meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
py3.install_sources(
2+
'__init__.py'
3+
)

0 commit comments

Comments
 (0)