From 82a33399eff568883af685604a691b866c9b9fce Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa Date: Thu, 10 Dec 2015 18:16:37 -0200 Subject: [PATCH] waf: gbenchmark: call _configure_cmake() in waf configuration 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. --- Tools/ardupilotwaf/gbenchmark.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Tools/ardupilotwaf/gbenchmark.py b/Tools/ardupilotwaf/gbenchmark.py index 831de76c83..d9b03bc111 100644 --- a/Tools/ardupilotwaf/gbenchmark.py +++ b/Tools/ardupilotwaf/gbenchmark.py @@ -73,6 +73,14 @@ def configure(cfg): env.GBENCHMARK_BUILD_REL = my_build_node.path_from(bldnode) 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.LIBPATH_GBENCHMARK = [prefix_node.make_node('lib').abspath()] env.LIB_GBENCHMARK = ['benchmark']