Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

waf: gbenchmark: move cmake configuration to a separate function

Browse Source
This commit is contained in:
Gustavo Jose de Sousa 2015-12-10 17:18:27 -02:00 committed by Lucas De Marchi
parent 7e8d25a56a
commit a31816c039
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Tools/ardupilotwaf/gbenchmark.py
View File

@ -9,6 +9,34 @@ from waflib import Build, Context, Task
from waflib.TaskGen import feature, before_method, after_method
from waflib.Errors import WafError
def _configure_cmake(ctx, bldnode):
env = ctx.env
my_build_node = bldnode.find_dir(env.GBENCHMARK_BUILD_REL)
if not my_build_node:
bldnode.make_node(env.GBENCHMARK_BUILD_REL).mkdir()
prefix_node = bldnode.make_node(env.GBENCHMARK_PREFIX_REL)
cmake_vars = {
'CMAKE_BUILD_TYPE': 'Release',
'CMAKE_INSTALL_PREFIX:PATH': prefix_node.abspath(),
}
cmake_vars = ' '.join("-D%s='%s'" % v for v in cmake_vars.items())
cmd = '%s %s %s %s' % (
env.CMAKE[0],
env.GBENCHMARK_SRC,
cmake_vars,
env.GBENCHMARK_GENERATOR_OPTION
)
ctx.cmd_and_log(
cmd,
cwd=env.GBENCHMARK_BUILD,
quiet=Context.BOTH,
)
def configure(cfg):
env = cfg.env
env.HAS_GBENCHMARK = False
@ -76,36 +104,22 @@ class gbenchmark_build(Task.Task):
if not cmake_lists:
bld.fatal('Submodule gbenchmark not initialized, please run configure again')
# Generate build system first, if necessary
my_build_node = bld.bldnode.find_dir(self.env.GBENCHMARK_BUILD_REL)
if not (my_build_node and my_build_node.find_resource('CMakeCache.txt')):
if not my_build_node:
bld.bldnode.make_node(self.env.GBENCHMARK_BUILD_REL).mkdir()
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,
cmake_vars,
self.env.GBENCHMARK_GENERATOR_OPTION
))
cmds.append('%s --build %s --target install' % (
self.env.CMAKE[0],
self.env.GBENCHMARK_BUILD
))
try:
for cmd in cmds:
bld.cmd_and_log(
cmd,
cwd=self.env.GBENCHMARK_BUILD,
quiet=Context.BOTH,
)
# Generate build system first, if necessary
my_build_node = bld.bldnode.find_dir(self.env.GBENCHMARK_BUILD_REL)
if not (my_build_node and my_build_node.find_resource('CMakeCache.txt')):
_configure_cmake(bld, bld.bldnode)
# Build gbenchmark
cmd = '%s --build %s --target install' % (
self.env.CMAKE[0],
self.env.GBENCHMARK_BUILD
)
bld.cmd_and_log(
cmd,
cwd=self.env.GBENCHMARK_BUILD,
quiet=Context.BOTH,
)
return 0
except WafError as e:
print(e)