diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-01-11 14:57:27 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-01-12 13:49:12 +0100 |
| commit | 998ee9197bf8e596f01ee9b5a05eaee3294c7d32 (patch) | |
| tree | c1d390fbdebb1acdad5e6bd2b93e17244dd99e50 /build/features.py | |
| parent | 4e8bb5d87dbc8e9503491ca2f090c899c326c1e3 (diff) | |
Upgrade googletest from 1.7.0 to 1.8.x (2019-01-30)
Diffstat (limited to 'build/features.py')
| -rw-r--r-- | build/features.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/features.py b/build/features.py index cb82637e14..8ca0039285 100644 --- a/build/features.py +++ b/build/features.py @@ -655,8 +655,8 @@ class TestSuite(Feature): test_env.Append(CCFLAGS='-pthread') test_env.Append(LINKFLAGS='-pthread') - test_env.Append(CPPPATH="#lib/gtest-1.7.0/include") - gtest_dir = test_env.Dir("lib/gtest-1.7.0") + test_env.Append(CPPPATH="#lib/googletest-1.8.x/googletest/include") + gtest_dir = test_env.Dir("lib/googletest-1.8.x/googletest") env = test_env SCons.Export('env') @@ -664,8 +664,8 @@ class TestSuite(Feature): env.SConscript(env.File('SConscript', gtest_dir)) # build and configure gmock - test_env.Append(CPPPATH="#lib/gmock-1.7.0/include") - gmock_dir = test_env.Dir("lib/gmock-1.7.0") + test_env.Append(CPPPATH="#lib/googletest-1.8.x/googlemock/include") + gmock_dir = test_env.Dir("lib/googletest-1.8.x/googlemock") env.SConscript(env.File('SConscript', gmock_dir)) # Build the benchmark library |