From e9a0bc14dd0d14741e909a1b268c35d8551e971e Mon Sep 17 00:00:00 2001 From: Jay Zhuang Date: Wed, 12 May 2021 11:38:03 -0700 Subject: [PATCH] Fix cmake failed to build db_bench (#8289) Summary: And change the cmake build on macos with GFLAGS on to cover more cases. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8289 Reviewed By: zhichao-cao Differential Revision: D28372467 Pulled By: jay-zhuang fbshipit-source-id: ad7fbe523c3fb135ef5281adbaf2070ca5d0873d --- .circleci/config.yml | 2 +- CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51fcf2bae..4c2d361d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,7 +138,7 @@ jobs: - install-cmake-on-macos - install-gflags-on-macos - pre-steps-macos - - run: ulimit -S -n 1048576 && (mkdir build && cd build && cmake -DWITH_GFLAGS=0 .. && make V=1 -j32) | .circleci/cat_ignore_eagain + - run: ulimit -S -n 1048576 && (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j32) | .circleci/cat_ignore_eagain - post-steps build-linux: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b34e5e2b..8f67a1a36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1342,6 +1342,7 @@ endif() if(WITH_BENCHMARK_TOOLS) add_executable(db_bench${ARTIFACT_SUFFIX} + tools/simulated_hybrid_file_system.cc tools/db_bench.cc tools/db_bench_tool.cc) target_link_libraries(db_bench${ARTIFACT_SUFFIX}