]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake/modules/BuildRocksDB.cmake: use BUILD_ALWAYS
authorKefu Chai <kchai@redhat.com>
Thu, 11 Jul 2019 11:30:26 +0000 (19:30 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 11 Jul 2019 11:30:28 +0000 (19:30 +0800)
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>
cmake/modules/BuildRocksDB.cmake

index 2ee07764348e1be66d6abd4237826203fda04c33..73b864c76a5e22d1b97fb6501e70cef37c5a2c72 100644 (file)
@@ -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)