diff options
| author | Yilun Chong <chongyilun250@sina.com> | 2018-02-01 13:50:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 13:50:45 -0800 |
| commit | 9717d6fa17dd7cb4d9119e46de888e32a24bd5e1 (patch) | |
| tree | ec289db67328d74e74c5511e1e2e94d44c61148f | |
| parent | 4e2bd9e6568b7944a4848b0338b8397ac120ee8b (diff) | |
| parent | 7f1491506c60909203d2491bb1634076fb7bfe28 (diff) | |
| download | protobuf-9717d6fa17dd7cb4d9119e46de888e32a24bd5e1.tar.gz protobuf-9717d6fa17dd7cb4d9119e46de888e32a24bd5e1.tar.bz2 protobuf-9717d6fa17dd7cb4d9119e46de888e32a24bd5e1.zip | |
Merge pull request #4265 from BSBandme/upgrade_benchmark_submodule
Upgrade benchmark submodule
| -rwxr-xr-x | benchmarks/Makefile.am | 2 | ||||
| m--------- | third_party/benchmark | 0 |
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 |