Merge pull request #24904 from taosdata/feat/TD-27463-3.0

enh: cloud edition check and update libdmodule
2024-02-27 19:23:31 +08:00 · 2024-02-27 19:23:31 +08:00 · 83b458c42a
parent 7ba2e37384 854e71fd13
commit 83b458c42a
7 changed files with 8 additions and 0 deletions
--- a/deps/arm/dm_static/libdmodule.a
+++ b/deps/arm/dm_static/libdmodule.a
--- a/deps/darwin/arm/dm_static/libdmodule.a
+++ b/deps/darwin/arm/dm_static/libdmodule.a
--- a/deps/darwin/x64/dm_static/libdmodule.a
+++ b/deps/darwin/x64/dm_static/libdmodule.a
--- a/deps/mips/dm_static/libdmodule.a
+++ b/deps/mips/dm_static/libdmodule.a
--- a/deps/x86/dm_static/libdmodule.a
+++ b/deps/x86/dm_static/libdmodule.a
--- a/source/dnode/mgmt/node_mgmt/CMakeLists.txt
+++ b/source/dnode/mgmt/node_mgmt/CMakeLists.txt
@ -14,6 +14,10 @@ IF (TD_STORAGE)

 ENDIF ()

+IF (DEFINED GRANT_CFG_INCLUDE_DIR)
+  add_definitions(-DGRANTS_CFG)
+ENDIF()
+
 target_include_directories(
    dnode
    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
--- a/source/dnode/mnode/impl/CMakeLists.txt
+++ b/source/dnode/mnode/impl/CMakeLists.txt
@ -26,6 +26,10 @@ target_link_libraries(
    mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser audit monitorfw
 )

+IF (DEFINED GRANT_CFG_INCLUDE_DIR)
+  add_definitions(-DGRANTS_CFG)
+ENDIF()
+
 IF (TD_GRANT)
  TARGET_LINK_LIBRARIES(mnode grant)
  ADD_DEFINITIONS(-D_GRANT)