diff options
author | Evan Martin <martine@danga.com> | 2012-12-30 00:37:12 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-12-30 00:42:10 (GMT) |
commit | 37b5ac7a1a8ca493edd863133e2e9f603c37dfa5 (patch) | |
tree | 9d6fbd04b822a296ebd84e6f33f4fe17dd6c8851 /configure.py | |
parent | e38eb5438151b5accc43e7e5d91f1435a2450f2f (diff) | |
download | Ninja-37b5ac7a1a8ca493edd863133e2e9f603c37dfa5.zip Ninja-37b5ac7a1a8ca493edd863133e2e9f603c37dfa5.tar.gz Ninja-37b5ac7a1a8ca493edd863133e2e9f603c37dfa5.tar.bz2 |
always set GTEST_HAS_RTTI=0 in all testing code
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/configure.py b/configure.py index 9391a68..f530ebf 100755 --- a/configure.py +++ b/configure.py @@ -315,7 +315,7 @@ all_targets += ninja n.comment('Tests all build into ninja_test executable.') variables = [] -test_cflags = cflags[:] +test_cflags = cflags + ['-DGTEST_HAS_RTTI=0'] test_ldflags = None test_libs = libs objs = [] @@ -335,14 +335,12 @@ if options.with_gtest: variables=[('cflags', gtest_cflags)]) test_cflags.append('-I%s' % os.path.join(path, 'include')) -elif platform == 'windows': - test_libs.extend(['gtest_main.lib', 'gtest.lib']) else: - test_cflags.append('-DGTEST_HAS_RTTI=0') - test_libs.extend(['-lgtest_main', '-lgtest']) - -if test_cflags == cflags: - test_cflags = None + # Use gtest from system. + if platform == 'windows': + test_libs.extend(['gtest_main.lib', 'gtest.lib']) + else: + test_libs.extend(['-lgtest_main', '-lgtest']) n.variable('test_cflags', test_cflags) for name in ['build_log_test', |