change more

cmake/rocksdb_CMakeLists.txt.in

@@ -1,28 +1,12 @@
 
 # rocksdb
-
-find_library(ROCKSDB_LIB NAMES rocksdb)
-find_path(ROCKSDB_INCLUDE_DIR NAMES rocksdb/db.h)
-
-if (ROCKSDB_LIB AND ROCKSDB_INCLUDE_DIR)
-  set(ROCKSDB_FOUND TRUE)
-endif()
-
-if(ROCKSDB_FOUND)
-  message(STATUS "Found rocksdb")
-else()
-  message(STATUS "Building rocksdb from source")
-
-  ExternalProject_Add(rocksdb
-          GIT_REPOSITORY https://github.com/facebook/rocksdb.git
-          GIT_TAG v8.1.1
-          SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb"
-          BINARY_DIR "${TD_CONTRIB_DIR}/rocksdb"
-          CONFIGURE_COMMAND ""
-          BUILD_COMMAND COMMAND $(MAKE) install-shared -j8
-          INSTALL_COMMAND ""
-          TEST_COMMAND ""
-          )
-endif()
-
-
+ExternalProject_Add(rocksdb
+        GIT_REPOSITORY https://github.com/facebook/rocksdb.git
+        GIT_TAG v8.1.1
+        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb"
+        BINARY_DIR "${TD_CONTRIB_DIR}/rocksdb"
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND COMMAND $(MAKE) install-shared -j8
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )

contrib/CMakeLists.txt

@@ -226,7 +226,6 @@ if(${BUILD_WITH_LEVELDB})
 endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
-if (FALSE)
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
 if(${BUILD_WITH_ROCKSDB})
     if(${TD_LINUX})
@@ -270,14 +269,13 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
 
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
     add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
     target_include_directories(
         rocksdb
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
     )
 endif(${BUILD_WITH_ROCKSDB})
-endif()
 
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev

source/dnode/vnode/CMakeLists.txt

@@ -101,7 +101,7 @@ target_link_libraries(
 
     # PUBLIC bdb
     # PUBLIC scalar
-    PUBLIC rocksdb
+    PUBLIC rocksdb-shared
     PUBLIC transport
     PUBLIC stream
     PUBLIC index

source/libs/stream/CMakeLists.txt

@@ -9,7 +9,7 @@ target_include_directories(
 if(${BUILD_WITH_ROCKSDB})
   target_link_libraries(
     stream
-    PUBLIC rocksdb tdb
+    PUBLIC rocksdb-shared tdb
     PRIVATE  os util transport qcom executor wal
   )