import quincy beta 17.1.0

[ceph.git] / ceph / cmake / modules / BuildRocksDB.cmake

diff --git a/ceph/cmake/modules/BuildRocksDB.cmake b/ceph/cmake/modules/BuildRocksDB.cmake
index 58ce26a6acaf6ed6e26fdb0926063acfa730adf4..f71f2bb6cc4d0619f5fea53225dc6f991812eb2e 100644 (file)
--- a/ceph/cmake/modules/BuildRocksDB.cmake
+++ b/ceph/cmake/modules/BuildRocksDB.cmake
@@ -16,9 +16,6 @@ function(build_rocksdb)
     list(APPEND rocksdb_INTERFACE_LINK_LIBRARIES JeMalloc::JeMalloc)
   endif()
 
-  if (WITH_CCACHE AND CCACHE_FOUND)
-    list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_COMPILER_LAUNCHER=ccache)
-  endif()
   list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
 
   list(APPEND rocksdb_CMAKE_ARGS -DWITH_SNAPPY=${SNAPPY_FOUND})
@@ -49,7 +46,6 @@ function(build_rocksdb)
   list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
   list(APPEND rocksdb_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF)
   list(APPEND rocksdb_CMAKE_ARGS -DUSE_RTTI=1)
-  list(APPEND rocksdb_CMAKE_ARGS -G${CMAKE_GENERATOR})
   CHECK_C_COMPILER_FLAG("-Wno-stringop-truncation" HAS_WARNING_STRINGOP_TRUNCATION)
   if(HAS_WARNING_STRINGOP_TRUNCATION)
     list(APPEND rocksdb_CMAKE_ARGS -DCMAKE_C_FLAGS=-Wno-stringop-truncation)
@@ -85,7 +81,7 @@ function(build_rocksdb)
     BINARY_DIR "${rocksdb_BINARY_DIR}"
     BUILD_COMMAND "${make_cmd}"
     BUILD_BYPRODUCTS "${rocksdb_LIBRARY}"
-    INSTALL_COMMAND "true"
+    INSTALL_COMMAND ""
     LIST_SEPARATOR !)
 
   add_library(RocksDB::RocksDB STATIC IMPORTED)