FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

gtest: reduced build requirements 

(strange behavior with bld.stlib)
This commit is contained in:
Syl 2014-02-20 22:20:48 +01:00
parent 825b7b5abf
commit e241496f3e
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playground/gtest/src/wscript_build
View File

@ -1,8 +1,7 @@
#! /usr/bin/env python #! /usr/bin/env python
# encoding: utf-8 # encoding: utf-8
bld( bld.stlib(
features = 'cxx cxxstlib',
source = 'Accumulator.cpp HelloWorld.cpp', source = 'Accumulator.cpp HelloWorld.cpp',
target = 'useless', target = 'useless',
export_includes = '.', export_includes = '.',

4
playground/gtest/tests/test0/wscript_build
View File

@ -1,8 +1,8 @@
#! /usr/bin/env python #! /usr/bin/env python
# encoding: utf-8 # encoding: utf-8
bld( bld.program(
features = 'cxx cxxprogram test', features = 'test',
source = 'HelloWorldTest.cpp', source = 'HelloWorldTest.cpp',
target = 'unit_test_program', target = 'unit_test_program',
use = 'unittestmain useless GTEST', use = 'unittestmain useless GTEST',

4
playground/gtest/tests/test1/wscript_build
View File

@ -7,8 +7,8 @@ def fun(task):
# print task.generator.bld.name_to_obj('somelib').link_task.outputs[0].abspath(task.env) # print task.generator.bld.name_to_obj('somelib').link_task.outputs[0].abspath(task.env)
# task.ut_exec.append('--help') # task.ut_exec.append('--help')
bld( bld.program(
features = 'cxx cxxprogram test', features = 'test',
source = 'AccumulatorTest.cpp', source = 'AccumulatorTest.cpp',
target = 'unit_test_program', target = 'unit_test_program',
use = 'unittestmain useless GTEST', use = 'unittestmain useless GTEST',

4
playground/gtest/tests/wscript
View File

@ -4,8 +4,10 @@
def build(bld): def build(bld):
bld.recurse('test0 test1') bld.recurse('test0 test1')
# can't use bld.stlib
bld( bld(
features = 'cxx stlib', # cxxstlib not required?!
features = 'cxx',
source = 'gtest_main.cc', source = 'gtest_main.cc',
use = 'GTEST', use = 'GTEST',
target = 'unittestmain') target = 'unittestmain')