From 7e8d25a56ae01aac0d41014d93d49c5f10e4c7d6 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Mon, 30 Nov 2015 19:31:57 -0200 Subject: [PATCH] waf: gbenchmark: use dict for cmake variables That makes it easy to add new variables for the build system generation command. --- Tools/ardupilotwaf/gbenchmark.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Tools/ardupilotwaf/gbenchmark.py b/Tools/ardupilotwaf/gbenchmark.py index ee8a24f012..814ce70cb6 100644 --- a/Tools/ardupilotwaf/gbenchmark.py +++ b/Tools/ardupilotwaf/gbenchmark.py @@ -82,10 +82,16 @@ class gbenchmark_build(Task.Task): if not my_build_node: bld.bldnode.make_node(self.env.GBENCHMARK_BUILD_REL).mkdir() - cmds.append('%s %s -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=%s %s' % ( + cmake_vars = { + 'CMAKE_BUILD_TYPE': 'Release', + 'CMAKE_INSTALL_PREFIX:PATH': bld.bldnode.make_node(self.env.GBENCHMARK_PREFIX_REL).abspath(), + } + cmake_vars = ' '.join("-D%s='%s'" % v for v in cmake_vars.items()) + + cmds.append('%s %s %s %s' % ( self.env.CMAKE[0], self.env.GBENCHMARK_SRC, - bld.bldnode.make_node(self.env.GBENCHMARK_PREFIX_REL).abspath(), + cmake_vars, self.env.GBENCHMARK_GENERATOR_OPTION ))