summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2019-07-11 13:30:26 +0200
committerKefu Chai <kchai@redhat.com>2019-07-11 13:30:28 +0200
commit6958d2dcb153fe5f33b0c2d03b6714c8a6653901 (patch)
treeb2500a3aaca9e5390c66af6e195137c0966da8c4
parentMerge pull request #28888 from joscollin/wip-fix-typo (diff)
downloadceph-6958d2dcb153fe5f33b0c2d03b6714c8a6653901.tar.xz
ceph-6958d2dcb153fe5f33b0c2d03b6714c8a6653901.zip
cmake/modules/BuildRocksDB.cmake: use BUILD_ALWAYS
this option was introduced by cmake 3.1, and we require cmake 3.5.1, so we can use it without using the homebrew solution. Signed-off-by: Kefu Chai <kchai@redhat.com>
-rw-r--r--cmake/modules/BuildRocksDB.cmake7
1 files changed, 1 insertions, 6 deletions
diff --git a/cmake/modules/BuildRocksDB.cmake b/cmake/modules/BuildRocksDB.cmake
index 2ee07764348..73b864c76a5 100644
--- a/cmake/modules/BuildRocksDB.cmake
+++ b/cmake/modules/BuildRocksDB.cmake
@@ -65,14 +65,9 @@ function(build_rocksdb)
CMAKE_ARGS ${rocksdb_CMAKE_ARGS}
BINARY_DIR "${rocksdb_BINARY_DIR}"
BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target rocksdb
+ BUILD_ALWAYS TRUE
BUILD_BYPRODUCTS "${rocksdb_LIBRARY}"
INSTALL_COMMAND "true")
- # force rocksdb make to be called on each time
- ExternalProject_Add_Step(rocksdb_ext forcebuild
- DEPENDEES configure
- DEPENDERS build
- COMMAND "true"
- ALWAYS 1)
add_library(RocksDB::RocksDB STATIC IMPORTED)
add_dependencies(RocksDB::RocksDB rocksdb_ext)