[+] improve meson wrapper
1. provide properly custom pkg_config_path folders for meson; 1.1. check that pyproject mode correctly discovers library built and installed by meson mode;
This commit is contained in:
parent
41d90d5dcf
commit
9d2d48f6ed
@ -5,7 +5,7 @@ project(
|
|||||||
).stdout().strip('\n'),
|
).stdout().strip('\n'),
|
||||||
# 'online.fxreader.uv',
|
# 'online.fxreader.uv',
|
||||||
# ['c', 'cpp'],
|
# ['c', 'cpp'],
|
||||||
version: '0.1.5.21',
|
version: '0.1.5.23',
|
||||||
# default_options: [
|
# default_options: [
|
||||||
# 'cpp_std=c++23',
|
# 'cpp_std=c++23',
|
||||||
# # 'prefer_static=true',
|
# # 'prefer_static=true',
|
||||||
|
@ -281,17 +281,27 @@ class CLI(abc.ABC):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
# @property
|
||||||
def pkg_config_path(
|
def pkg_config_path(
|
||||||
self,
|
self,
|
||||||
) -> set[pathlib.Path]:
|
project: Optional[str] = None,
|
||||||
return {
|
) -> list[pathlib.Path]:
|
||||||
|
res: list[pathlib.Path] = []
|
||||||
|
|
||||||
|
if project:
|
||||||
|
res.append(self.projects[project].dest_dir / 'lib' / 'pkgconfig')
|
||||||
|
|
||||||
|
res.extend(
|
||||||
|
[
|
||||||
pathlib.Path(o)
|
pathlib.Path(o)
|
||||||
for o in glob.glob(
|
for o in glob.glob(
|
||||||
str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'),
|
str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'),
|
||||||
recursive=True,
|
recursive=True,
|
||||||
)
|
)
|
||||||
}
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
def deploy_wheel(
|
def deploy_wheel(
|
||||||
self,
|
self,
|
||||||
@ -701,6 +711,7 @@ class CLI(abc.ABC):
|
|||||||
'setup',
|
'setup',
|
||||||
str(project.source_dir),
|
str(project.source_dir),
|
||||||
str(project.build_dir / mode),
|
str(project.build_dir / mode),
|
||||||
|
'--pkg-config-path={}'.format(json.dumps([str(o) for o in self.pkg_config_path(project_name)])),
|
||||||
'-Dmodes=["{}"]'.format(mode),
|
'-Dmodes=["{}"]'.format(mode),
|
||||||
*extra_args,
|
*extra_args,
|
||||||
# '-Dpkgconfig.relocatable=true',
|
# '-Dpkgconfig.relocatable=true',
|
||||||
|
BIN
releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl
(Stored with Git LFS)
Normal file
BIN
releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl
(Stored with Git LFS)
Normal file
BIN
releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user