diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 +0000 |
| commit | bcf926ec656688d7eb03159faaddbf56bd4ec8e2 (patch) | |
| tree | cec29bb0b412c73dd0d5c192e9f2357e70493f02 /scons/SConstruct.common | |
| parent | 7e13e0f5dd2f9458e0a613e0a91c894eb80126fc (diff) | |
| download | googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.gz googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.bz2 googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.zip | |
Improves the scons scripts and run_tests.py (by Vlad Losev); uses typed tests in gtest-port_test.cc only when typed tests are available (by Zhanyong Wan); makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
Diffstat (limited to 'scons/SConstruct.common')
| -rw-r--r-- | scons/SConstruct.common | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scons/SConstruct.common b/scons/SConstruct.common index d9915b90..ed896d09 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -243,10 +243,8 @@ class SConstructHelper: # Invokes SConscript with variant_dir being build/<config name>. # Counter-intuitively, src_dir is relative to the build dir and has # to be '..' to point to the scons directory. - SConscript('SConscript', - src_dir='..', - variant_dir=env['BUILD_DIR'], - duplicate=0) + VariantDir(env['BUILD_DIR'], src_dir='../..', duplicate=0); + SConscript(env['BUILD_DIR'] + '/gtest/scons/SConscript') sconstruct_helper = SConstructHelper() |