aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: gbenchmark: call _configure_cmake() in waf configuration

Browse Source 
The cmake checks for gbenchmark need to run some code. Calling
_configure_cmake() only during build can potentially fail build. That would
happen in some cross-compilations for example.
This commit is contained in:
Gustavo Jose de Sousa 2015-12-10 18:16:37 -02:00 committed by Lucas De Marchi
parent a31816c039
commit 82a33399ef
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/ardupilotwaf/gbenchmark.py
View File

@ -73,6 +73,14 @@ def configure(cfg):
env.GBENCHMARK_BUILD_REL = my_build_node.path_from(bldnode) env.GBENCHMARK_BUILD_REL = my_build_node.path_from(bldnode)
env.GBENCHMARK_SRC = my_src_node.abspath() env.GBENCHMARK_SRC = my_src_node.abspath()
cfg.start_msg('Configuring gbenchmark')
try:
_configure_cmake(cfg, bldnode)
cfg.end_msg('done')
except:
cfg.end_msg('failed', color='YELLOW')
return
env.INCLUDES_GBENCHMARK = [prefix_node.make_node('include').abspath()] env.INCLUDES_GBENCHMARK = [prefix_node.make_node('include').abspath()]
env.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()] env.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()]
env.LIB_GBENCHMARK = ['benchmark'] env.LIB_GBENCHMARK = ['benchmark']