summaryrefslogtreecommitdiffstats
path: root/SConscript
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-01-11 14:57:27 +0100
committerUwe Klotz <uklotz@mixxx.org>2020-01-12 13:49:12 +0100
commit998ee9197bf8e596f01ee9b5a05eaee3294c7d32 (patch)
treec1d390fbdebb1acdad5e6bd2b93e17244dd99e50 /SConscript
parent4e8bb5d87dbc8e9503491ca2f090c899c326c1e3 (diff)
Upgrade googletest from 1.7.0 to 1.8.x (2019-01-30)
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/SConscript b/SConscript
index 1150ef0308..4a8d90d1fc 100644
--- a/SConscript
+++ b/SConscript
@@ -107,12 +107,12 @@ def define_test_targets(default=False):
test_files = Glob('src/test/*.cpp', strings=True)
test_env = env.Clone()
- test_env.Append(CPPPATH="lib/gtest-1.7.0/include")
- test_env.Append(LIBPATH="lib/gtest-1.7.0")
+ test_env.Append(CPPPATH="lib/googletest-1.8.x/googletest/include")
+ test_env.Append(LIBPATH="lib/googletest-1.8.x/googletest")
test_env.Append(LIBS=['gtest'])
- test_env.Append(CPPPATH="lib/gmock-1.7.0/include")
- test_env.Append(LIBPATH="lib/gmock-1.7.0")
+ test_env.Append(CPPPATH="lib/googletest-1.8.x/googlemock/include")
+ test_env.Append(LIBPATH="lib/googletest-1.8.x/googlemock")
test_env.Append(LIBS=['gmock'])
test_env.Append(CPPPATH="lib/benchmark/include")