aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-02-23 17:05:11 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-06-06 18:27:03 +0200
commitd114d8446eac10ad27f4b09c02e0049890a4b2a0 (patch)
tree434666f4b4d087d88d108406b11b92690a6e3b0b /mesonbuild/interpreter.py
parent1041c71eb0370041492055fff5c7a2bffd306b58 (diff)
downloadmeson-d114d8446eac10ad27f4b09c02e0049890a4b2a0.zip
meson-d114d8446eac10ad27f4b09c02e0049890a4b2a0.tar.gz
meson-d114d8446eac10ad27f4b09c02e0049890a4b2a0.tar.bz2
cmake: Minor fixes
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 6d268c6..6df7ae1 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2546,10 +2546,9 @@ external dependencies (including libraries) must go to "dependencies".''')
def do_subproject_cmake(self, dirname, subdir, subdir_abs, default_options, required, kwargs):
with mlog.nested():
- build_dir = os.path.join(self.environment.get_scratch_dir(), 'cmake_subp_{}'.format(dirname))
new_build = self.build.copy()
prefix = self.coredata.builtins['prefix'].value
- cm_int = CMakeInterpreter(new_build, subdir, subdir_abs, build_dir, prefix, new_build.environment, self.backend)
+ cm_int = CMakeInterpreter(new_build, subdir, subdir_abs, prefix, new_build.environment, self.backend)
cm_int.initialise()
cm_int.analyse()
@@ -2562,15 +2561,15 @@ external dependencies (including libraries) must go to "dependencies".''')
mlog.log()
# Debug print the generated meson file
- mlog.debug('=== BEGIN meson.build ===')
+ mlog.log('=== BEGIN meson.build ===')
from .ast import AstIndentationGenerator, AstPrinter
printer = AstPrinter()
ast.accept(AstIndentationGenerator())
ast.accept(printer)
printer.post_process()
- mlog.debug(printer.result)
- mlog.debug('=== END meson.build ===')
- mlog.debug()
+ mlog.log(printer.result)
+ mlog.log('=== END meson.build ===')
+ mlog.log()
result = self.do_subproject_meson(dirname, subdir, default_options, required, kwargs, ast, cm_int.bs_files)