diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 23:34:59 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-12-16 23:34:59 +0000 |
| commit | 88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384 (patch) | |
| tree | 2ccb8a80d9d1ee12db0de85b03dc9e9ed957b25a /scons/SConstruct | |
| parent | 075b76bb96f1b6eac7dde41b47de0dd456b0f473 (diff) | |
| download | googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.gz googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.tar.bz2 googletest-88e97c822c988eaa9f8bcbaa1ea5d702ffd7d384.zip | |
Removes uses of GTEST_HAS_STD_STRING.
Diffstat (limited to 'scons/SConstruct')
| -rw-r--r-- | scons/SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scons/SConstruct b/scons/SConstruct index 1f2f37f6..c749d6a8 100644 --- a/scons/SConstruct +++ b/scons/SConstruct @@ -50,8 +50,12 @@ sconstruct_helper.Initialize(build_root_path='..', win_base = sconstruct_helper.MakeWinBaseEnvironment() +# We don't support VC 7.1 with exceptions disabled, so we always +# enable exceptions for VC 7.1. For newer versions of VC, we still +# compile with exceptions disabled by default, as that's a more common +# setting for our users. if win_base.get('MSVS_VERSION', None) == '7.1': - sconstruct_helper.AllowVc71StlWithoutExceptions(win_base) + sconstruct_helper.EnableExceptions(win_base) sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg') sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt') |