[+] fix meson third_party_roots option

This commit is contained in:
Siarhei Siniak 2025-05-29 12:02:52 +03:00
parent a7d68110c8
commit bab76643f2
3 changed files with 7 additions and 3 deletions

@ -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.17+27.8', version: '0.1.5.17+27.9',
# default_options: [ # default_options: [
# 'cpp_std=c++23', # 'cpp_std=c++23',
# # 'prefer_static=true', # # 'prefer_static=true',

@ -1,5 +1,6 @@
import dataclasses import dataclasses
import io import io
import json
import importlib import importlib
import configparser import configparser
import glob import glob
@ -369,7 +370,7 @@ class CLI(abc.ABC):
shutil.rmtree(pyproject_build_dir) shutil.rmtree(pyproject_build_dir)
if len(self.third_party_roots(project_name)) > 0: if len(self.third_party_roots(project_name)) > 0:
extra_args.extend(['-Csetup-args=%s' % ('-Dthird_party_roots=%s' % str(o.absolute())) for o in self.third_party_roots(project_name)]) extra_args.append('-Csetup-args=%s' % ('-Dthird_party_roots=%s' % json.dumps([str(o.absolute()) for o in self.third_party_roots(project_name)])))
cmd = [ cmd = [
sys.executable, sys.executable,
@ -645,7 +646,7 @@ class CLI(abc.ABC):
extra_args: list[str] = [] extra_args: list[str] = []
if len(self.third_party_roots(project_name)) > 0: if len(self.third_party_roots(project_name)) > 0:
extra_args.extend(['-Dthird_party_roots=%s' % str(o.absolute()) for o in self.third_party_roots(project_name)]) extra_args.append('-Dthird_party_roots=%s' % json.dumps([str(o.absolute()) for o in self.third_party_roots(project_name)]))
extra_args = self._cross_file( extra_args = self._cross_file(
extra_args=extra_args, extra_args=extra_args,

Binary file not shown.