aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yilun Chong <yilunchong@google.com>2018-02-01 11:11:00 -0800
committerGravatar Yilun Chong <yilunchong@google.com>2018-02-01 11:11:00 -0800
commit7f1491506c60909203d2491bb1634076fb7bfe28 (patch)
tree7ea5fb70cbbd3bc0fd46cc02e9016f402c30d605
parent6456e5d6462e8c3d21d6afd64420dbd028ea3245 (diff)
upgrade submodule
-rwxr-xr-xbenchmarks/Makefile.am2
m---------third_party/benchmark0
2 files changed, 1 insertions, 1 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index cfb1d5b9..cdda92ba 100755
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -104,7 +104,7 @@ initialize_submodule:
oldpwd=`pwd`
cd $(top_srcdir)/third_party
git submodule update --init -r
- cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make
+ cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=OFF && make
cd $$oldpwd
touch initialize_submodule
diff --git a/third_party/benchmark b/third_party/benchmark
-Subproject 360e66c1c4777c99402cf8cd535aa510fee1657
+Subproject 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f