Blame 0003-gnome.generate_gir-Also-include-current-build-dir.patch
|
Igor Gnatenko |
511817 |
From 320fda7867428406771adfd3c4afa91a33fd6845 Mon Sep 17 00:00:00 2001
|
|
Igor Gnatenko |
57d01a |
From: Patrick Griffis <tingping@tingping.se>
|
|
Igor Gnatenko |
57d01a |
Date: Mon, 3 Oct 2016 12:51:23 -0400
|
|
Igor Gnatenko |
511817 |
Subject: [PATCH 03/10] gnome.generate_gir(): Also include current build dir
|
|
Igor Gnatenko |
57d01a |
|
|
Igor Gnatenko |
57d01a |
Continuation of 084b854ce057ee6d954c24e58321caa92f542bc5
|
|
Igor Gnatenko |
57d01a |
|
|
Igor Gnatenko |
57d01a |
(cherry picked from commit 94b7b59546cfbc311336ec3700393cfff3d4a840)
|
|
Igor Gnatenko |
57d01a |
---
|
|
Igor Gnatenko |
57d01a |
mesonbuild/modules/gnome.py | 3 ++-
|
|
Igor Gnatenko |
57d01a |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Igor Gnatenko |
57d01a |
|
|
Igor Gnatenko |
57d01a |
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
|
|
Igor Gnatenko |
57d01a |
index 81cc462..be111ea 100644
|
|
Igor Gnatenko |
57d01a |
--- a/mesonbuild/modules/gnome.py
|
|
Igor Gnatenko |
57d01a |
+++ b/mesonbuild/modules/gnome.py
|
|
Igor Gnatenko |
57d01a |
@@ -225,7 +225,8 @@ class GnomeModule:
|
|
Igor Gnatenko |
57d01a |
|
|
Igor Gnatenko |
57d01a |
extra_args = mesonlib.stringlistify(kwargs.pop('extra_args', []))
|
|
Igor Gnatenko |
57d01a |
scan_command += extra_args
|
|
Igor Gnatenko |
57d01a |
- scan_command += ['-I' + os.path.join(state.environment.get_source_dir(), state.subdir)]
|
|
Igor Gnatenko |
57d01a |
+ scan_command += ['-I' + os.path.join(state.environment.get_source_dir(), state.subdir),
|
|
Igor Gnatenko |
57d01a |
+ '-I' + os.path.join(state.environment.get_build_dir(), state.subdir)]
|
|
Igor Gnatenko |
57d01a |
scan_command += self.get_include_args(state, girtarget.get_include_dirs())
|
|
Igor Gnatenko |
57d01a |
|
|
Igor Gnatenko |
57d01a |
if 'link_with' in kwargs:
|
|
Igor Gnatenko |
57d01a |
--
|
|
Igor Gnatenko |
57d01a |
2.10.1
|
|
Igor Gnatenko |
57d01a |
|