diff --git a/python/meson.build b/python/meson.build index 9fca143..e0c9bc1 100644 --- a/python/meson.build +++ b/python/meson.build @@ -5,7 +5,7 @@ project( ).stdout().strip('\n'), # 'online.fxreader.uv', # ['c', 'cpp'], - version: '0.1.5.21', + version: '0.1.5.23', # default_options: [ # 'cpp_std=c++23', # # 'prefer_static=true', diff --git a/python/online/fxreader/pr34/commands_typed/cli.py b/python/online/fxreader/pr34/commands_typed/cli.py index b629a2a..c718b4f 100644 --- a/python/online/fxreader/pr34/commands_typed/cli.py +++ b/python/online/fxreader/pr34/commands_typed/cli.py @@ -281,17 +281,27 @@ class CLI(abc.ABC): ] ) - @property + # @property def pkg_config_path( self, - ) -> set[pathlib.Path]: - return { - pathlib.Path(o) - for o in glob.glob( - str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'), - recursive=True, - ) - } + project: Optional[str] = None, + ) -> list[pathlib.Path]: + res: list[pathlib.Path] = [] + + if project: + res.append(self.projects[project].dest_dir / 'lib' / 'pkgconfig') + + res.extend( + [ + pathlib.Path(o) + for o in glob.glob( + str(self.dist_settings.env_path / 'lib' / 'python*' / '**' / 'pkgconfig'), + recursive=True, + ) + ] + ) + + return res def deploy_wheel( self, @@ -701,6 +711,7 @@ class CLI(abc.ABC): 'setup', str(project.source_dir), 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), *extra_args, # '-Dpkgconfig.relocatable=true', diff --git a/releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl new file mode 100644 index 0000000..ddd7cd1 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.22-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58bebb4c696cb36c24ec89e848785bcea89ec3b261f97c54ce8b350626785b98 +size 72324 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl new file mode 100644 index 0000000..7141429 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.23-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:584d16efd888caace6884bed15449514d48ca670d46d16dff0675ac54642d429 +size 72346