waf: cope with new format of gtest submodule

6 years ago · 84f6e49594
1 changed files with 3 additions and 3 deletions
--- a/Tools/ardupilotwaf/gtest.py
+++ b/Tools/ardupilotwaf/gtest.py
@ -42,10 +42,10 @@ def configure(cfg):
				@@ -42,10 +42,10 @@ def configure(cfg):
 def libgtest(bld, **kw):
    kw['cxxflags'] = Utils.to_list(kw.get('cxxflags', [])) + ['-Wno-undef']
    kw.update(
-        source='modules/gtest/src/gtest-all.cc',
+        source='modules/gtest/googletest/src/gtest-all.cc',
        target='gtest/gtest',
-        includes='modules/gtest/ modules/gtest/include',
-        export_includes='modules/gtest/include',
+        includes='modules/gtest/googletest modules/gtest/googletest/include',
+        export_includes='modules/gtest/googletest/include',
        name='GTEST',
    )
    return bld.stlib(**kw)