diff --git a/cmake/cmake.define b/cmake/cmake.define
index 5b65738c700bd7fa862da6284881ada17f245302..3038bf975edf1bc297df8723ac8f33b2f084d00e 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -120,8 +120,14 @@ ELSE ()
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
 	      MESSAGE(STATUS "Compile with Address Sanitizer!")
     ELSE ()
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        MESSAGE(STATUS "XXXXXXXXXXXXXX Clang/AppleClang" ${TD_DARWIN})
+        IF (${TD_DARWIN})
+            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-y2k")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-y2k")
+        ELSE ()
+            SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        ENDIF ()
     ENDIF ()
 
     # disable all assert
diff --git a/cmake/cmake.options b/cmake/cmake.options
index 60ff00affc01408b084a8993441e4fe7052f4977..4ec9d18e08580a735598b647ef65188b46fdbc61 100644
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -109,7 +109,7 @@ option(
 option(
     BUILD_WITH_ROCKSDB 
     "If build with rocksdb" 
-    OFF
+    ON
 )
 
 option(
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index ed6120bd30a622e79ad7f89693268bcde4c276d8..6cd6f79d8b34dc1bb411bd9a0383dc7ab51ef896 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -78,10 +78,10 @@ if(${BUILD_WITH_LEVELDB})
 endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
-#if(${BUILD_WITH_ROCKSDB})
-cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-add_definitions(-DUSE_ROCKSDB)
-#endif(${BUILD_WITH_ROCKSDB})
+if(${BUILD_WITH_ROCKSDB})
+    cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    add_definitions(-DUSE_ROCKSDB)
+endif(${BUILD_WITH_ROCKSDB})
 
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
@@ -222,7 +222,7 @@ endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
-#if(${BUILD_WITH_ROCKSDB})
+if(${BUILD_WITH_ROCKSDB})
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
     option(WITH_TESTS "" OFF)
     option(WITH_BENCHMARK_TOOLS "" OFF)
@@ -234,7 +234,7 @@ endif(${BUILD_WITH_LEVELDB})
         rocksdb
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
     )
-#endif(${BUILD_WITH_ROCKSDB})
+endif(${BUILD_WITH_ROCKSDB})
 
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev