Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: gbenchmark: use dict for cmake variables 

That makes it easy to add new variables for the build system generation
command.
This commit is contained in:
Gustavo Jose de Sousa 2015-11-30 19:31:57 -02:00 committed by Lucas De Marchi
parent 7d94095497
commit 7e8d25a56a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/ardupilotwaf/gbenchmark.py
View File

@ -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
))