diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-31 00:03:56 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-31 00:03:56 +0000 |
| commit | 3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54 (patch) | |
| tree | ec59a674c03743b83736504c3c8d3bf228a8d17d /scons | |
| parent | 755e3bf78443de1e386b84a56091927bebb877ac (diff) | |
| download | googletest-3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54.tar.gz googletest-3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54.tar.bz2 googletest-3e54f5a3715f2c0b4425e55cc5d42dd42f4eda54.zip | |
Fixes a MSVC warning (by Vlad Losev); fixes SConscript to work with VC 7.1 and exceptions enabled (by Zhanyong Wan).
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/SConscript | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scons/SConscript b/scons/SConscript index 2e0edf3e..88357ca2 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -121,6 +121,11 @@ platform = env_with_exceptions['PLATFORM'] if platform == 'win32': env_with_exceptions.Append(CCFLAGS = ['/EHsc']) env_with_exceptions.Append(CPPDEFINES = '_HAS_EXCEPTIONS=1') + # Undoes the _TYPEINFO_ hack, which is unnecessary and only creates + # trouble when exceptions are enabled. + cppdefines = env_with_exceptions['CPPDEFINES'] + if '_TYPEINFO_' in cppdefines: + cppdefines.remove('_TYPEINFO_') gtest_ex_obj = env_with_exceptions.Object(target='gtest_ex', source=gtest_source) |