diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-05-11 09:18:47 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-05-12 15:54:37 -0400 |
| commit | 4e312c19e693a69b0650ce6c8a8903163c959996 (patch) | |
| tree | 6f0eee6b0281536078d9b105a4985f504c9b930b /mesonbuild/modules/qt.py | |
| parent | 44acefd8365c0ccca428e5ef69153c059aa8e575 (diff) | |
| download | meson-4e312c19e693a69b0650ce6c8a8903163c959996.zip meson-4e312c19e693a69b0650ce6c8a8903163c959996.tar.gz meson-4e312c19e693a69b0650ce6c8a8903163c959996.tar.bz2 | |
gnome: Fix gtkdoc generation
install_scripts used to replace @BUILD_ROOT@ and @SOURCE_ROOT@ but it
was not documented and got removed in Meson 0.58.0. gnome.gtkdoc() was
relying on that behaviour, but it has always been broken in the case the
source or build directory contains spaces.
Fix this by changing get_include_args() to substitue paths directly
which will then get escaped correctly.
Add a unit test that builds GObject documentation which is where this
issue has been spotted.
Fixes: #8744
Diffstat (limited to 'mesonbuild/modules/qt.py')
| -rw-r--r-- | mesonbuild/modules/qt.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index b7389bd..1bf0099 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -23,7 +23,7 @@ from .. import mesonlib from ..mesonlib import MesonException, extract_as_list, File, unholder, version_compare from ..dependencies import Dependency import xml.etree.ElementTree as ET -from . import ModuleReturnValue, get_include_args, ExtensionModule +from . import ModuleReturnValue, ExtensionModule from ..interpreterbase import noPosargs, permittedKwargs, FeatureNew, FeatureNewKwargs from ..interpreter import extract_required_kwarg from ..programs import NonExistingExternalProgram @@ -239,7 +239,7 @@ class QtBaseModule(ExtensionModule): ui_gen = build.Generator([self.uic], ui_kwargs) ui_output = ui_gen.process_files(f'Qt{self.qt_version} ui', ui_files, state) sources.append(ui_output) - inc = get_include_args(include_dirs=include_directories) + inc = state.get_include_args(include_dirs=include_directories) compile_args = [] for dep in unholder(dependencies): if isinstance(dep, Dependency): |