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

waf: cope with new format of gtest submodule

Browse Source
This commit is contained in:
Peter Barker 2019-08-16 09:42:45 +10:00 committed by Andrew Tridgell
parent 52cb509f11
commit 84f6e49594
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/ardupilotwaf/gtest.py
View File

@ -42,10 +42,10 @@ def configure(cfg):
def libgtest(bld, **kw): def libgtest(bld, **kw):
kw['cxxflags'] = Utils.to_list(kw.get('cxxflags', [])) + ['-Wno-undef'] kw['cxxflags'] = Utils.to_list(kw.get('cxxflags', [])) + ['-Wno-undef']
kw.update( kw.update(
source='modules/gtest/src/gtest-all.cc', source='modules/gtest/googletest/src/gtest-all.cc',
target='gtest/gtest', target='gtest/gtest',
includes='modules/gtest/ modules/gtest/include', includes='modules/gtest/googletest modules/gtest/googletest/include',
export_includes='modules/gtest/include', export_includes='modules/gtest/googletest/include',
name='GTEST', name='GTEST',
) )
return bld.stlib(**kw) return bld.stlib(**kw)