Merge pull request #21717 from taosdata/enh/staticLibMain

Enh/static lib main

.gitignore

@@ -16,7 +16,6 @@ debug/
 release/
 target/
 debs/
-deps/
 rpms/
 mac/
 *.pyc

CMakeLists.txt

@@ -15,11 +15,15 @@ SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
 set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake")
 set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib")
 
+
+
+
 include(${TD_SUPPORT_DIR}/cmake.platform)
 include(${TD_SUPPORT_DIR}/cmake.define)
 include(${TD_SUPPORT_DIR}/cmake.options)
 include(${TD_SUPPORT_DIR}/cmake.version)
 
+
 # contrib
 add_subdirectory(contrib)
 

cmake/cmake.platform

@@ -172,5 +172,15 @@ ENDIF()
 
 MESSAGE(STATUS "Platform arch:" ${PLATFORM_ARCH_STR})
 
+set(TD_DEPS_DIR "x86")
+if (TD_LINUX)
+  IF (TD_ARM_64 OR TD_ARM_32)
+    set(TD_DEPS_DIR "arm")
+  ELSE() 
+    set(TD_DEPS_DIR "x86")
+  ENDIF()
+endif()
+MESSAGE(STATUS "DEPS_DIR" ${TD_DEPS_DIR})
+
 MESSAGE("C Compiler: ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_C_COMPILER_VERSION})")
 MESSAGE("CXX Compiler: ${CMAKE_CXX_COMPILER} (${CMAKE_C_COMPILER_ID}, ${CMAKE_CXX_COMPILER_VERSION})")

cmake/rocksdb_CMakeLists.txt.in

 
 # rocksdb
-#set(librocksdb_src ${TD_CONTRIB_DIR}/rocksdb)
-#set(librocksdb_binary ${TD_CONTRIB_DIR}/rocksdb/build)
+IF (NOT ${TD_LINUX})
 
 ExternalProject_Add(rocksdb
 	URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
@@ -14,3 +13,4 @@ ExternalProject_Add(rocksdb
     INSTALL_COMMAND ""
     TEST_COMMAND ""
     )
+ENDIF(NOT ${TD_LINUX})

contrib/CMakeLists.txt

@@ -78,10 +78,18 @@ if(${BUILD_WITH_LEVELDB})
 endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
+IF (NOT ${TD_LINUX})
 if(${BUILD_WITH_ROCKSDB})
     cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})
+ELSE()
+if(${BUILD_WITH_ROCKSDB})
+    #cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+    add_definitions(-DUSE_ROCKSDB)
+endif(${BUILD_WITH_ROCKSDB})
+
+ENDIF(NOT ${TD_LINUX})
 
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
@@ -237,6 +245,7 @@ if (${BUILD_WITH_UV})
     endif(${TD_LINUX})
 endif (${BUILD_WITH_UV})
 
+IF (NOT ${TD_LINUX})
 if(${BUILD_WITH_ROCKSDB})
     if(${TD_LINUX})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
@@ -297,6 +306,7 @@ if(${BUILD_WITH_ROCKSDB})
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
     )
 endif(${BUILD_WITH_ROCKSDB})
+ENDIF (NOT ${TD_LINUX})
 
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev

source/dnode/vnode/CMakeLists.txt

@@ -80,6 +80,7 @@ IF (TD_VNODE_PLUGINS)
   )
 ENDIF ()
 
+IF (NOT ${TD_LINUX})
 target_include_directories(
     vnode
     PUBLIC "inc"
@@ -87,7 +88,26 @@ target_include_directories(
     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
 )
+ELSE()
+target_include_directories(
+    vnode
+    PUBLIC "inc"
+    PUBLIC "src/inc"
+    PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+)
+
+ENDIF(NOT ${TD_LINUX})
+
 IF (TD_LINUX)
+    target_include_directories(
+      vnode 
+      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+    )
+
+    target_link_directories(
+        vnode 
+        PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+    )
 target_link_libraries(
     vnode
     PUBLIC os

source/libs/stream/CMakeLists.txt

@@ -9,6 +9,19 @@ target_include_directories(
 
 if(${BUILD_WITH_ROCKSDB})
   IF (TD_LINUX)
+    target_include_directories(
+    stream
+    PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+  )
+  target_link_directories(
+    stream 
+    PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+  )
+  target_link_libraries(
+    stream
+    PUBLIC rocksdb tdb
+    PRIVATE  os util transport qcom executor wal index
+  )
   target_link_libraries(
     stream
     PUBLIC rocksdb tdb
@@ -20,14 +33,14 @@ if(${BUILD_WITH_ROCKSDB})
     PUBLIC rocksdb tdb
     PRIVATE  os util transport qcom executor wal index
   )
-
-  ENDIF()
-
   target_include_directories(
     stream
     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
   )
 
+  ENDIF()
+
+
   add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})