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

waf: px4: accommodate use of ap_library

Browse Source 
- Use AP_LIBRARIES_OBJECTS_KW instead of AP_STLIB_FEATURES.
 - Change the feature name to one that makes more sense.
This commit is contained in:
Gustavo Jose de Sousa 2016-07-25 19:03:53 -03:00 committed by Lucas De Marchi
parent b8e518a533
commit 51bef96811
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/ardupilotwaf/px4.py
View File

@ -17,7 +17,7 @@ def _load_dynamic_env_data(bld):
for name in ('cxx_flags', 'include_dirs', 'definitions'): for name in ('cxx_flags', 'include_dirs', 'definitions'):
_dynamic_env_data[name] = bldnode.find_node(name).read().split(';') _dynamic_env_data[name] = bldnode.find_node(name).read().split(';')
@feature('px4_ap_stlib', 'px4_ap_program') @feature('px4_ap_library', 'px4_ap_program')
@before_method('process_source') @before_method('process_source')
def px4_dynamic_env(self): def px4_dynamic_env(self):
# The generated files from configuration possibly don't exist if it's just # The generated files from configuration possibly don't exist if it's just
@ -216,7 +216,9 @@ def configure(cfg):
env = cfg.env env = cfg.env
env.AP_PROGRAM_FEATURES += ['px4_ap_program'] env.AP_PROGRAM_FEATURES += ['px4_ap_program']
env.AP_STLIB_FEATURES += ['px4_ap_stlib']
kw = env.AP_LIBRARIES_OBJECTS_KW
kw['features'] = Utils.to_list(kw.get('features', [])) + ['px4_ap_library']
def srcpath(path): def srcpath(path):
return cfg.srcnode.make_node(path).abspath() return cfg.srcnode.make_node(path).abspath()