diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-24 17:19:25 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-02-24 17:19:25 +0000 |
| commit | 3bef459eac9aa84c579f34249aebc9ff56832054 (patch) | |
| tree | c91cb1205fb45e4a96889ae478afa66a0559694c /scons/SConstruct.common | |
| parent | dd280cfa8dff2247f71a1177d7c8f0c2fde9789a (diff) | |
| download | googletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.gz googletest-3bef459eac9aa84c579f34249aebc9ff56832054.tar.bz2 googletest-3bef459eac9aa84c579f34249aebc9ff56832054.zip | |
Adds threading support (by Miklos Fazekas, Vlad Losev, and Chandler Carruth); adds wide InitGoogleTest to gtest.def (by Vlad Losev); updates the version number (by Zhanyong Wan); updates the release notes for 1.5.0 (by Vlad Losev); removes scons scripts from the distribution (by Zhanyong Wan); adds the cmake build script to the distribution (by Zhanyong Wan); adds fused source files to the distribution (by Vlad Losev and Chandler Carruth).
Diffstat (limited to 'scons/SConstruct.common')
| -rw-r--r-- | scons/SConstruct.common | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/SConstruct.common b/scons/SConstruct.common index 59b8864b..6b10033b 100644 --- a/scons/SConstruct.common +++ b/scons/SConstruct.common @@ -200,7 +200,9 @@ class SConstructHelper: '-Wall', '-Werror', '-Wshadow', + '-DGTEST_HAS_PTHREAD=1' ]) + env.Append(LINKFLAGS=['-pthread']) if optimized: env.Append(CCFLAGS=['-O2'], CPPDEFINES=['NDEBUG', '_NDEBUG']) else: |