Merge branch 'enh/3.0' into fix/shared_link_rocksdb

cmake/cmake.define

@@ -123,8 +123,8 @@ ELSE ()
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -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 -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -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_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -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")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3-Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     ENDIF ()
 
     # disable all assert

contrib/CMakeLists.txt

@@ -268,8 +268,11 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_BENCHMARK_TOOLS "" OFF)
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
-
+    IF (TD_LINUX) 
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
+    ELSE()
+    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+    ENDIF()
     add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
     target_include_directories(
         rocksdb

source/dnode/vnode/CMakeLists.txt

@@ -87,6 +87,7 @@ target_include_directories(
     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
 )
+IF (TD_LINUX)
 target_link_libraries(
     vnode
     PUBLIC os
@@ -107,6 +108,28 @@ target_link_libraries(
     PUBLIC stream
     PUBLIC index
 )
+ELSE()
+target_link_libraries(
+    vnode
+    PUBLIC os
+    PUBLIC util
+    PUBLIC common
+    PUBLIC tfs
+    PUBLIC wal
+    PUBLIC qworker
+    PUBLIC sync
+    PUBLIC executor
+    PUBLIC scheduler
+    PUBLIC tdb
+
+    # PUBLIC bdb
+    # PUBLIC scalar
+    PUBLIC rocksdb
+    PUBLIC transport
+    PUBLIC stream
+    PUBLIC index
+)
+ENDIF()
 
 IF (TD_GRANT)
   TARGET_LINK_LIBRARIES(vnode PUBLIC grant)

source/libs/stream/CMakeLists.txt

@@ -6,12 +6,22 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
+
 if(${BUILD_WITH_ROCKSDB})
+  IF (TD_LINUX)
   target_link_libraries(
     stream
     PUBLIC rocksdb-shared tdb
     PRIVATE  os util transport qcom executor wal index
   )
+  ELSE() 
+  target_link_libraries(
+    stream
+    PUBLIC rocksdb tdb
+    PRIVATE  os util transport qcom executor wal index
+  )
+
+  ENDIF()
 
   target_include_directories(
     stream