Merge pull request #21810 from taosdata/enh/addComipleOpt

Enh/add comiple opt

cmake/cmake.options

@@ -189,3 +189,9 @@ option(
    "If build release version"
    OFF
 )
+
+option(
+   BUILD_CONTRIB
+   "If build thirdpart from source"
+   OFF
+)

cmake/rocksdb_CMakeLists.txt.in

 
 # rocksdb
-IF (NOT ${TD_LINUX})
-
-ExternalProject_Add(rocksdb
-	URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
-  	URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
-  	DOWNLOAD_NO_PROGRESS 1
-	DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
-	SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    TEST_COMMAND ""
-    )
-ENDIF(NOT ${TD_LINUX})
+if (${BUILD_CONTRIB})
+        ExternalProject_Add(rocksdb
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
+	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
+            CONFIGURE_COMMAND ""
+            BUILD_COMMAND ""
+            INSTALL_COMMAND ""
+            TEST_COMMAND ""
+        )
+else()
+    if (NOT ${TD_LINUX})
+        ExternalProject_Add(rocksdb
+	        URL https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz
+  	        URL_HASH MD5=3b4c97ee45df9c8a5517308d31ab008b
+  	        DOWNLOAD_NO_PROGRESS 1
+	        DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download" 
+	        SOURCE_DIR "${TD_CONTRIB_DIR}/rocksdb" 
+            CONFIGURE_COMMAND ""
+            BUILD_COMMAND ""
+            INSTALL_COMMAND ""
+            TEST_COMMAND ""
+        )
+    endif()
+endif()

contrib/CMakeLists.txt

@@ -77,19 +77,25 @@ if(${BUILD_WITH_LEVELDB})
     cat("${TD_SUPPORT_DIR}/leveldb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 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})
+
+if (${BUILD_CONTRIB})
+    if(${BUILD_WITH_ROCKSDB})
+        cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+        add_definitions(-DUSE_ROCKSDB)
+    endif()
+else() 
+    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})
+            add_definitions(-DUSE_ROCKSDB)
+        endif(${BUILD_WITH_ROCKSDB})
+    endif()
+endif()
+
 
 # canonical-raft
 if(${BUILD_WITH_CRAFT})
@@ -245,68 +251,103 @@ 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")
-        IF ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-            SET(CMAKE_BUILD_TYPE Release)
-        endif()
-    endif(${TD_LINUX})
-    MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
-
-    if(${TD_DARWIN})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
-    endif(${TD_DARWIN})
-
-    if (${TD_DARWIN_ARM64})
-        set(HAS_ARMV8_CRC true)
-    endif(${TD_DARWIN_ARM64})
-
-    if (${TD_WINDOWS})
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
-    endif(${TD_WINDOWS})
-
-
-    if(${TD_DARWIN})
-        option(HAVE_THREAD_LOCAL "" OFF)
-        option(WITH_IOSTATS_CONTEXT "" OFF)
-        option(WITH_PERF_CONTEXT "" OFF)
-    endif(${TD_DARWIN})
-
-    if(${TD_WINDOWS})
-        option(WITH_JNI "" OFF)
-    endif(${TD_WINDOWS})
-
-    if(${TD_WINDOWS})
-        option(WITH_MD_LIBRARY "build with MD" OFF)
-        set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
-    endif(${TD_WINDOWS})
-
-
-    option(WITH_FALLOCATE "" OFF)
-    option(WITH_JEMALLOC "" OFF)
-    option(WITH_GFLAGS "" OFF)
-    option(PORTABLE "" ON)
-    option(WITH_LIBURING "" OFF)
-    option(FAIL_ON_WARNINGS OFF)
-
-    option(WITH_TESTS "" OFF)
-    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" OFF)
-    ELSE()
-    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
-    ENDIF()
-    add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
-    target_include_directories(
-        rocksdb
-        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
-    )
-endif(${BUILD_WITH_ROCKSDB})
-ENDIF (NOT ${TD_LINUX})
+if (${BUILD_WITH_ROCKSDB})
+    if (${BUILD_CONTRIB})
+        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")
+            if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+                SET(CMAKE_BUILD_TYPE Release)
+            endif()
+        endif(${TD_LINUX})
+        MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
+
+        if(${TD_DARWIN})
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+        endif(${TD_DARWIN})
+
+        if (${TD_DARWIN_ARM64})
+            set(HAS_ARMV8_CRC true)
+        endif(${TD_DARWIN_ARM64})
+
+        if (${TD_WINDOWS})
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+            option(WITH_JNI "" OFF)
+            option(WITH_MD_LIBRARY "build with MD" OFF)
+            set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+        endif(${TD_WINDOWS})
+
+
+        if(${TD_DARWIN})
+            option(HAVE_THREAD_LOCAL "" OFF)
+            option(WITH_IOSTATS_CONTEXT "" OFF)
+            option(WITH_PERF_CONTEXT "" OFF)
+        endif(${TD_DARWIN})
+
+        option(WITH_FALLOCATE "" OFF)
+        option(WITH_JEMALLOC "" OFF)
+        option(WITH_GFLAGS "" OFF)
+        option(PORTABLE "" ON)
+        option(WITH_LIBURING "" OFF)
+        option(FAIL_ON_WARNINGS OFF)
+
+        option(WITH_TESTS "" OFF)
+        option(WITH_BENCHMARK_TOOLS "" OFF)
+        option(WITH_TOOLS "" OFF)
+        option(WITH_LIBURING "" OFF)
+
+        option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+        add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
+        target_include_directories(
+            rocksdb
+            PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
+        )
+    else() 
+        if (NOT ${TD_LINUX})
+            MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
+            if(${TD_DARWIN})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
+            endif(${TD_DARWIN})
+
+            if (${TD_DARWIN_ARM64})
+                set(HAS_ARMV8_CRC true)
+            endif(${TD_DARWIN_ARM64})
+
+            if (${TD_WINDOWS})
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4819")
+                option(WITH_JNI "" OFF)
+                option(WITH_MD_LIBRARY "build with MD" OFF)
+                set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
+            endif(${TD_WINDOWS})
+
+
+            if(${TD_DARWIN})
+                option(HAVE_THREAD_LOCAL "" OFF)
+                option(WITH_IOSTATS_CONTEXT "" OFF)
+                option(WITH_PERF_CONTEXT "" OFF)
+            endif(${TD_DARWIN})
+
+            option(WITH_FALLOCATE "" OFF)
+            option(WITH_JEMALLOC "" OFF)
+            option(WITH_GFLAGS "" OFF)
+            option(PORTABLE "" ON)
+            option(WITH_LIBURING "" OFF)
+            option(FAIL_ON_WARNINGS OFF)
+
+            option(WITH_TESTS "" OFF)
+            option(WITH_BENCHMARK_TOOLS "" OFF)
+            option(WITH_TOOLS "" OFF)
+            option(WITH_LIBURING "" OFF)
+
+            option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+            add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
+            target_include_directories(
+                rocksdb
+                PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
+            )
+        endif() 
+      
+    endif()
+endif()
 
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev

source/dnode/vnode/CMakeLists.txt

@@ -80,55 +80,50 @@ IF (TD_VNODE_PLUGINS)
   )
 ENDIF ()
 
-IF (NOT ${TD_LINUX})
-target_include_directories(
-    vnode
-    PUBLIC "inc"
-    PUBLIC "src/inc"
-    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)
+# IF (NOT ${TD_LINUX})
+# target_include_directories(
+#     vnode
+#     PUBLIC "inc"
+#     PUBLIC "src/inc"
+#     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 (${BUILD_CONTRIB})
     target_include_directories(
-      vnode 
-      PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+        vnode
+        PUBLIC "inc"
+        PUBLIC "src/inc"
+        PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
+        PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
     )
-
-    target_link_directories(
-        vnode 
-        PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
+else()
+    target_include_directories(
+        vnode
+        PUBLIC "inc"
+        PUBLIC "src/inc"
+        PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
     )
-target_link_libraries(
-    vnode
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
-    PUBLIC tfs
-    PUBLIC wal
-    PUBLIC qworker
-    PUBLIC sync
-    PUBLIC executor
-    PUBLIC scheduler
-    PUBLIC tdb
+    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"
+        )
+    endif()
+endif()
 
-    # PUBLIC bdb
-    # PUBLIC scalar
-    PUBLIC rocksdb
-    PUBLIC transport
-    PUBLIC stream
-    PUBLIC index
-)
-ELSE()
 target_link_libraries(
     vnode
     PUBLIC os
@@ -149,7 +144,6 @@ target_link_libraries(
     PUBLIC stream
     PUBLIC index
 )
-ENDIF()
 
 IF (TD_GRANT)
   TARGET_LINK_LIBRARIES(vnode PUBLIC grant)

source/libs/stream/CMakeLists.txt

@@ -8,39 +8,43 @@ target_include_directories(
 
 
 if(${BUILD_WITH_ROCKSDB})
-  IF (TD_LINUX)
+  if (${BUILD_CONTRIB})
+    target_link_libraries(
+      stream
+      PUBLIC rocksdb tdb
+      PRIVATE  os util transport qcom executor wal index
+    )
     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
-    PRIVATE  os util transport qcom executor wal index
-  )
-  ELSE() 
-  target_link_libraries(
-    stream
-    PUBLIC rocksdb tdb
-    PRIVATE  os util transport qcom executor wal index
-  )
-  target_include_directories(
-    stream
-    PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
-  )
-
-  ENDIF()
-
-
+      stream
+      PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+    )
+  else()
+    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
+    )
+    else() 
+      target_link_libraries(
+        stream
+        PUBLIC rocksdb tdb
+        PRIVATE  os util transport qcom executor wal index
+      )
+      target_include_directories(
+        stream
+        PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
+      )
+    endif()
+  endif() 
   add_definitions(-DUSE_ROCKSDB)
 endif(${BUILD_WITH_ROCKSDB})