fix: format cmake file

This commit is contained in:
Shengliang Guan 2024-10-24 10:09:54 +08:00
parent cd8674f96f
commit 81c30ab7c0
34 changed files with 665 additions and 668 deletions

View File

@ -1,13 +1,13 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project( project(
TDengine TDengine
VERSION 3.0 VERSION 3.0
DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)" DESCRIPTION "An open-source big data platform designed and optimized for the Internet of Things(IOT)"
) )
if (NOT DEFINED TD_SOURCE_DIR) if(NOT DEFINED TD_SOURCE_DIR)
set( TD_SOURCE_DIR ${PROJECT_SOURCE_DIR} ) set(TD_SOURCE_DIR ${PROJECT_SOURCE_DIR})
endif() endif()
SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR}) SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
@ -15,13 +15,11 @@ SET(TD_COMMUNITY_DIR ${PROJECT_SOURCE_DIR})
set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake") set(TD_SUPPORT_DIR "${TD_SOURCE_DIR}/cmake")
set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib") set(TD_CONTRIB_DIR "${TD_SOURCE_DIR}/contrib")
include(${TD_SUPPORT_DIR}/cmake.platform) include(${TD_SUPPORT_DIR}/cmake.platform)
include(${TD_SUPPORT_DIR}/cmake.define) include(${TD_SUPPORT_DIR}/cmake.define)
include(${TD_SUPPORT_DIR}/cmake.options) include(${TD_SUPPORT_DIR}/cmake.options)
include(${TD_SUPPORT_DIR}/cmake.version) include(${TD_SUPPORT_DIR}/cmake.version)
# contrib # contrib
add_subdirectory(contrib) add_subdirectory(contrib)
@ -33,8 +31,8 @@ target_include_directories(api INTERFACE "include/client")
# src # src
if(${BUILD_TEST}) if(${BUILD_TEST})
include(CTest) include(CTest)
enable_testing() enable_testing()
endif(${BUILD_TEST}) endif(${BUILD_TEST})
add_subdirectory(source) add_subdirectory(source)

View File

@ -1,8 +1,8 @@
aux_source_directory(src CLIENT_SRC) aux_source_directory(src CLIENT_SRC)
IF (TD_ENTERPRISE) if(TD_ENTERPRISE)
LIST(APPEND CLIENT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/clientView.c) LIST(APPEND CLIENT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/clientView.c)
ENDIF () endif()
if(TD_WINDOWS) if(TD_WINDOWS)
add_library(taos SHARED ${CLIENT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/taos.rc.in) add_library(taos SHARED ${CLIENT_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/taos.rc.in)

View File

@ -1,121 +1,122 @@
aux_source_directory(src COMMON_SRC) aux_source_directory(src COMMON_SRC)
IF (TD_ENTERPRISE)
LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c) if(TD_ENTERPRISE)
ENDIF() LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c)
endif()
add_library(common STATIC ${COMMON_SRC}) add_library(common STATIC ${COMMON_SRC})
if (DEFINED GRANT_CFG_INCLUDE_DIR) if(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) add_definitions(-DGRANTS_CFG)
endif() endif()
IF (TD_GRANT) if(TD_GRANT)
ADD_DEFINITIONS(-D_GRANT) ADD_DEFINITIONS(-D_GRANT)
ENDIF () endif()
IF (TD_STORAGE) if(TD_STORAGE)
ADD_DEFINITIONS(-D_STORAGE) ADD_DEFINITIONS(-D_STORAGE)
TARGET_LINK_LIBRARIES(common PRIVATE storage) TARGET_LINK_LIBRARIES(common PRIVATE storage)
ENDIF () endif()
IF (TD_ENTERPRISE) if(TD_ENTERPRISE)
IF(${BUILD_WITH_S3}) if(${BUILD_WITH_S3})
add_definitions(-DUSE_S3) add_definitions(-DUSE_S3)
ELSEIF(${BUILD_WITH_COS}) ELSEIF(${BUILD_WITH_COS})
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
ENDIF() endif()
ENDIF() endif()
target_include_directories( target_include_directories(
common common
PUBLIC "${TD_SOURCE_DIR}/include/common" PUBLIC "${TD_SOURCE_DIR}/include/common"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
PRIVATE "${GRANT_CFG_INCLUDE_DIR}" PRIVATE "${GRANT_CFG_INCLUDE_DIR}"
) )
IF(${TD_WINDOWS})
target_include_directories( if(${TD_WINDOWS})
common target_include_directories(
PRIVATE "${TD_SOURCE_DIR}/contrib/pthread" common
PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex" PRIVATE "${TD_SOURCE_DIR}/contrib/pthread"
) PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex"
ENDIF () )
endif()
target_link_libraries( target_link_libraries(
common common
PUBLIC os PUBLIC os
PUBLIC util PUBLIC util
INTERFACE api INTERFACE api
) )
if(${BUILD_S3}) if(${BUILD_S3})
if(${BUILD_WITH_S3})
target_include_directories(
common
if(${BUILD_WITH_S3}) PUBLIC "$ENV{HOME}/.cos-local.2/include"
target_include_directories( )
common
PUBLIC "$ENV{HOME}/.cos-local.2/include" set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
) set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
find_library(S3_LIBRARY s3)
find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
find_library(XML2_LIBRARY xml2)
find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
target_link_libraries(
common
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") # s3
set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2) PUBLIC ${S3_LIBRARY}
find_library(S3_LIBRARY s3) PUBLIC ${CURL_LIBRARY}
find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH) PUBLIC ${SSL_LIBRARY}
find_library(XML2_LIBRARY xml2) PUBLIC ${CRYPTO_LIBRARY}
find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH) PUBLIC ${XML2_LIBRARY}
find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH) )
target_link_libraries(
common
# s3 add_definitions(-DUSE_S3)
PUBLIC ${S3_LIBRARY} endif()
PUBLIC ${CURL_LIBRARY}
PUBLIC ${SSL_LIBRARY}
PUBLIC ${CRYPTO_LIBRARY}
PUBLIC ${XML2_LIBRARY}
)
add_definitions(-DUSE_S3) if(${BUILD_WITH_COS})
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
find_library(MINIXML_LIBRARY mxml)
find_library(CURL_LIBRARY curl)
target_link_libraries(
common
# s3
PUBLIC cos_c_sdk_static
PUBLIC ${APR_UTIL_LIBRARY}
PUBLIC ${APR_LIBRARY}
PUBLIC ${MINIXML_LIBRARY}
PUBLIC ${CURL_LIBRARY}
)
# s3
FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/)
if(APR_CONFIG_BIN)
EXECUTE_PROCESS(
COMMAND ${APR_CONFIG_BIN} --includedir
OUTPUT_VARIABLE APR_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif() endif()
if(${BUILD_WITH_COS}) include_directories(${APR_INCLUDE_DIR})
target_include_directories(
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") common
find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/) PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/) PUBLIC "$ENV{HOME}/.cos-local.1/include"
find_library(MINIXML_LIBRARY mxml) )
find_library(CURL_LIBRARY curl)
target_link_libraries(
common
# s3
PUBLIC cos_c_sdk_static
PUBLIC ${APR_UTIL_LIBRARY}
PUBLIC ${APR_LIBRARY}
PUBLIC ${MINIXML_LIBRARY}
PUBLIC ${CURL_LIBRARY}
)
# s3
FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/)
IF (APR_CONFIG_BIN)
EXECUTE_PROCESS(
COMMAND ${APR_CONFIG_BIN} --includedir
OUTPUT_VARIABLE APR_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
ENDIF()
include_directories (${APR_INCLUDE_DIR})
target_include_directories(
common
PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
PUBLIC "$ENV{HOME}/.cos-local.1/include"
)
add_definitions(-DUSE_COS)
endif(${BUILD_WITH_COS})
add_definitions(-DUSE_COS)
endif(${BUILD_WITH_COS})
endif() endif()
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -10,29 +10,28 @@ add_subdirectory(test)
aux_source_directory(exe EXEC_SRC) aux_source_directory(exe EXEC_SRC)
add_executable(taosd ${EXEC_SRC}) add_executable(taosd ${EXEC_SRC})
target_include_directories( target_include_directories(
taosd taosd
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc"
) )
IF (TD_ENTERPRISE) IF(TD_ENTERPRISE)
IF(${BUILD_WITH_S3}) IF(${BUILD_WITH_S3})
add_definitions(-DUSE_S3) add_definitions(-DUSE_S3)
ELSEIF(${BUILD_WITH_COS}) ELSEIF(${BUILD_WITH_COS})
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc) ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc") SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
ELSE () ELSE()
SET(LINK_JEMALLOC "") SET(LINK_JEMALLOC "")
ENDIF () ENDIF()
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(taosd jemalloc)
target_link_libraries(taosd dnode crypt ${LINK_JEMALLOC})
ELSE ()
target_link_libraries(taosd dnode crypt)
ENDIF ()
IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(taosd jemalloc)
target_link_libraries(taosd dnode crypt ${LINK_JEMALLOC})
ELSE()
target_link_libraries(taosd dnode crypt)
ENDIF()

View File

@ -1,24 +1,25 @@
aux_source_directory(src MGMT_DNODE) aux_source_directory(src MGMT_DNODE)
add_library(mgmt_dnode STATIC ${MGMT_DNODE}) add_library(mgmt_dnode STATIC ${MGMT_DNODE})
if (DEFINED GRANT_CFG_INCLUDE_DIR)
if(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) add_definitions(-DGRANTS_CFG)
endif() endif()
IF (NOT BUILD_DM_MODULE) if(NOT BUILD_DM_MODULE)
MESSAGE(STATUS "NOT BUILD_DM_MODULE") MESSAGE(STATUS "NOT BUILD_DM_MODULE")
target_link_directories( target_link_directories(
mgmt_dnode mgmt_dnode
PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/dm_static" PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/dm_static"
) )
ELSE() else()
MESSAGE(STATUS "BUILD_DM_MODULE") MESSAGE(STATUS "BUILD_DM_MODULE")
ENDIF() endif()
target_include_directories( target_include_directories(
mgmt_dnode mgmt_dnode
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
PUBLIC "${GRANT_CFG_INCLUDE_DIR}" PUBLIC "${GRANT_CFG_INCLUDE_DIR}"
) )
target_link_libraries( target_link_libraries(
mgmt_dnode node_util dmodule mgmt_dnode node_util dmodule
) )

View File

@ -1,22 +1,22 @@
aux_source_directory(src IMPLEMENT_SRC) aux_source_directory(src IMPLEMENT_SRC)
add_library(dnode STATIC ${IMPLEMENT_SRC}) add_library(dnode STATIC ${IMPLEMENT_SRC})
target_link_libraries( target_link_libraries(
dnode mgmt_mnode mgmt_qnode mgmt_snode mgmt_vnode mgmt_dnode monitorfw tcs dnode mgmt_mnode mgmt_qnode mgmt_snode mgmt_vnode mgmt_dnode monitorfw tcs
) )
IF (TD_ENTERPRISE) IF(TD_ENTERPRISE)
IF(${BUILD_WITH_S3}) IF(${BUILD_WITH_S3})
add_definitions(-DUSE_S3) add_definitions(-DUSE_S3)
ELSEIF(${BUILD_WITH_COS}) ELSEIF(${BUILD_WITH_COS})
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF (DEFINED GRANT_CFG_INCLUDE_DIR) IF(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) add_definitions(-DGRANTS_CFG)
ENDIF() ENDIF()
target_include_directories( target_include_directories(
dnode dnode
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )

View File

@ -1,44 +1,46 @@
aux_source_directory(src MNODE_SRC) aux_source_directory(src MNODE_SRC)
IF (TD_PRIVILEGE)
if(TD_PRIVILEGE)
ADD_DEFINITIONS(-D_PRIVILEGE) ADD_DEFINITIONS(-D_PRIVILEGE)
ENDIF () endif()
IF (TD_ENTERPRISE)
if(TD_ENTERPRISE)
LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/privilege/src/privilege.c) LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/privilege/src/privilege.c)
LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDb.c) LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDb.c)
LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndVgroup.c) LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndVgroup.c)
LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDnode.c) LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/mnode/src/mndDnode.c)
LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/mndView.c) LIST(APPEND MNODE_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/mndView.c)
IF(${BUILD_WITH_S3}) if(${BUILD_WITH_S3})
add_definitions(-DUSE_S3) add_definitions(-DUSE_S3)
ELSEIF(${BUILD_WITH_COS}) ELSEIF(${BUILD_WITH_COS})
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
ENDIF() endif()
IF(${BUILD_WITH_ANALYSIS}) if(${BUILD_WITH_ANALYSIS})
add_definitions(-DUSE_ANAL) add_definitions(-DUSE_ANAL)
ENDIF() endif()
ENDIF () endif()
add_library(mnode STATIC ${MNODE_SRC}) add_library(mnode STATIC ${MNODE_SRC})
target_include_directories( target_include_directories(
mnode mnode
PUBLIC "${TD_SOURCE_DIR}/include/dnode/mnode" PUBLIC "${TD_SOURCE_DIR}/include/dnode/mnode"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
target_link_libraries( target_link_libraries(
mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser audit monitorfw mnode scheduler sdb wal transport cjson sync monitor executor qworker stream parser audit monitorfw
) )
IF (DEFINED GRANT_CFG_INCLUDE_DIR) if(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) add_definitions(-DGRANTS_CFG)
ENDIF() endif()
IF (TD_GRANT) if(TD_GRANT)
TARGET_LINK_LIBRARIES(mnode grant) TARGET_LINK_LIBRARIES(mnode grant)
ADD_DEFINITIONS(-D_GRANT) ADD_DEFINITIONS(-D_GRANT)
ENDIF () endif()
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,24 +1,26 @@
# vnode # vnode
add_subdirectory(src/tqCommon) add_subdirectory(src/tqCommon)
add_library(vnode STATIC "") add_library(vnode STATIC "")
if(${TD_DARWIN}) if(${TD_DARWIN})
target_compile_options(vnode PRIVATE -Wno-error=single-bit-bitfield-constant-conversion) target_compile_options(vnode PRIVATE -Wno-error=single-bit-bitfield-constant-conversion)
endif(${TD_DARWIN}) endif(${TD_DARWIN})
set( set(
VNODE_SOURCE_FILES VNODE_SOURCE_FILES
"src/vnd/vnodeOpen.c" "src/vnd/vnodeOpen.c"
"src/vnd/vnodeBufPool.c" "src/vnd/vnodeBufPool.c"
"src/vnd/vnodeCfg.c" "src/vnd/vnodeCfg.c"
"src/vnd/vnodeCommit.c" "src/vnd/vnodeCommit.c"
"src/vnd/vnodeQuery.c" "src/vnd/vnodeQuery.c"
"src/vnd/vnodeModule.c" "src/vnd/vnodeModule.c"
"src/vnd/vnodeSvr.c" "src/vnd/vnodeSvr.c"
"src/vnd/vnodeSync.c" "src/vnd/vnodeSync.c"
"src/vnd/vnodeSnapshot.c" "src/vnd/vnodeSnapshot.c"
"src/vnd/vnodeRetention.c" "src/vnd/vnodeRetention.c"
"src/vnd/vnodeInitApi.c" "src/vnd/vnodeInitApi.c"
"src/vnd/vnodeAsync.c" "src/vnd/vnodeAsync.c"
"src/vnd/vnodeHash.c" "src/vnd/vnodeHash.c"
# meta # meta
"src/meta/metaOpen.c" "src/meta/metaOpen.c"
@ -40,23 +42,23 @@ set(
"src/sma/smaSnapshot.c" "src/sma/smaSnapshot.c"
"src/sma/smaTimeRange.c" "src/sma/smaTimeRange.c"
# # tsdb # # tsdb
# "src/tsdb/tsdbCommit.c" # "src/tsdb/tsdbCommit.c"
# "src/tsdb/tsdbFile.c" # "src/tsdb/tsdbFile.c"
# "src/tsdb/tsdbFS.c" # "src/tsdb/tsdbFS.c"
# "src/tsdb/tsdbOpen.c" # "src/tsdb/tsdbOpen.c"
# "src/tsdb/tsdbMemTable.c" # "src/tsdb/tsdbMemTable.c"
# "src/tsdb/tsdbRead.c" # "src/tsdb/tsdbRead.c"
# "src/tsdb/tsdbCache.c" # "src/tsdb/tsdbCache.c"
# "src/tsdb/tsdbWrite.c" # "src/tsdb/tsdbWrite.c"
# "src/tsdb/tsdbReaderWriter.c" # "src/tsdb/tsdbReaderWriter.c"
# "src/tsdb/tsdbUtil.c" # "src/tsdb/tsdbUtil.c"
# "src/tsdb/tsdbSnapshot.c" # "src/tsdb/tsdbSnapshot.c"
# "src/tsdb/tsdbCacheRead.c" # "src/tsdb/tsdbCacheRead.c"
# "src/tsdb/tsdbRetention.c" # "src/tsdb/tsdbRetention.c"
# "src/tsdb/tsdbDiskData.c" # "src/tsdb/tsdbDiskData.c"
# "src/tsdb/tsdbMergeTree.c" # "src/tsdb/tsdbMergeTree.c"
# "src/tsdb/tsdbDataIter.c" # "src/tsdb/tsdbDataIter.c"
# tq # tq
"src/tq/tq.c" "src/tq/tq.c"
@ -71,14 +73,13 @@ set(
"src/tq/tqSnapshot.c" "src/tq/tqSnapshot.c"
"src/tq/tqStreamStateSnap.c" "src/tq/tqStreamStateSnap.c"
"src/tq/tqStreamTaskSnap.c" "src/tq/tqStreamTaskSnap.c"
) )
aux_source_directory("src/tsdb/" TSDB_SOURCE_FILES) aux_source_directory("src/tsdb/" TSDB_SOURCE_FILES)
list( list(
APPEND APPEND
VNODE_SOURCE_FILES VNODE_SOURCE_FILES
${TSDB_SOURCE_FILES} ${TSDB_SOURCE_FILES}
) )
target_sources( target_sources(
@ -87,34 +88,33 @@ target_sources(
${VNODE_SOURCE_FILES} ${VNODE_SOURCE_FILES}
) )
IF (TD_VNODE_PLUGINS) if(TD_VNODE_PLUGINS)
target_sources( target_sources(
vnode vnode
PRIVATE PRIVATE
${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c
${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c
${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c
) )
ENDIF () endif()
# IF (NOT ${TD_LINUX}) # if (NOT ${TD_LINUX})
# target_include_directories( # target_include_directories(
# vnode # vnode
# PUBLIC "inc" # PUBLIC "inc"
# PUBLIC "src/inc" # PUBLIC "src/inc"
# PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar" # PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
# PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include" # PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
# ) # )
# ELSE() # ELSE()
# target_include_directories( # target_include_directories(
# vnode # vnode
# PUBLIC "inc" # PUBLIC "inc"
# PUBLIC "src/inc" # PUBLIC "src/inc"
# PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar" # PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
# ) # )
#ENDIF(NOT ${TD_LINUX}) # endif(NOT ${TD_LINUX})
if(${BUILD_CONTRIB})
if (${BUILD_CONTRIB})
target_include_directories( target_include_directories(
vnode vnode
PUBLIC "inc" PUBLIC "inc"
@ -135,8 +135,9 @@ else()
PUBLIC "${TD_SOURCE_DIR}/include/libs/crypt" PUBLIC "${TD_SOURCE_DIR}/include/libs/crypt"
PUBLIC "${TD_SOURCE_DIR}/include/dnode/vnode" PUBLIC "${TD_SOURCE_DIR}/include/dnode/vnode"
) )
if (${TD_LINUX})
target_include_directories( if(${TD_LINUX})
target_include_directories(
vnode vnode
PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static" PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
) )
@ -170,7 +171,7 @@ target_link_libraries(
# PUBLIC bdb # PUBLIC bdb
# PUBLIC scalar # PUBLIC scalar
#PUBLIC zstd # PUBLIC zstd
PUBLIC rocksdb PUBLIC rocksdb
PUBLIC transport PUBLIC transport
PUBLIC stream PUBLIC stream
@ -178,9 +179,9 @@ target_link_libraries(
PUBLIC tqCommon PUBLIC tqCommon
) )
IF (TD_GRANT) if(TD_GRANT)
TARGET_LINK_LIBRARIES(vnode PUBLIC grant) TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
ENDIF () endif()
target_compile_definitions(vnode PUBLIC -DMETA_REFACT) target_compile_definitions(vnode PUBLIC -DMETA_REFACT)

View File

@ -1,7 +1,8 @@
aux_source_directory(src AUDIT_SRC) aux_source_directory(src AUDIT_SRC)
IF (TD_ENTERPRISE)
IF(TD_ENTERPRISE)
LIST(APPEND AUDIT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/audit/src/audit.c) LIST(APPEND AUDIT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/audit/src/audit.c)
ENDIF () ENDIF()
add_library(audit STATIC ${AUDIT_SRC}) add_library(audit STATIC ${AUDIT_SRC})
target_include_directories( target_include_directories(

View File

@ -1,4 +1,4 @@
#if(${TD_LINUX}) # if(${TD_LINUX})
aux_source_directory(src AZ_SRC) aux_source_directory(src AZ_SRC)
add_library(az STATIC ${AZ_SRC}) add_library(az STATIC ${AZ_SRC})
@ -13,20 +13,21 @@ if(${BUILD_S3})
endif() endif()
target_include_directories( target_include_directories(
az az
PUBLIC "${TD_SOURCE_DIR}/include/libs/azure" PUBLIC "${TD_SOURCE_DIR}/include/libs/azure"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
target_link_libraries( target_link_libraries(
az az
PUBLIC cjson PUBLIC cjson
PUBLIC os PUBLIC os
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})
#endif(${TD_LINUX})
# endif(${TD_LINUX})

View File

@ -1,22 +1,20 @@
if (TD_LINUX) if(TD_LINUX)
aux_source_directory(. AZ_TEST_SRC)
aux_source_directory(. AZ_TEST_SRC) add_executable(azTest ${AZ_TEST_SRC})
target_include_directories(azTest
add_executable(azTest ${AZ_TEST_SRC}) PUBLIC
target_include_directories(azTest "${TD_SOURCE_DIR}/include/libs/azure"
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
"${TD_SOURCE_DIR}/include/libs/azure" )
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_link_libraries(azTest
az
gtest_main
)
enable_testing()
add_test(
NAME az_test
COMMAND azTest
)
target_link_libraries(azTest
az
gtest_main
)
enable_testing()
add_test(
NAME az_test
COMMAND azTest
)
endif(TD_LINUX) endif(TD_LINUX)

View File

@ -7,10 +7,10 @@ target_include_directories(
) )
target_link_libraries( target_link_libraries(
catalog catalog
PRIVATE os util transport qcom nodes PRIVATE os util transport qcom nodes
) )
# if(${BUILD_TEST}) # if(${BUILD_TEST})
# ADD_SUBDIRECTORY(test) # ADD_SUBDIRECTORY(test)
# endif(${BUILD_TEST}) # endif(${BUILD_TEST})

View File

@ -12,5 +12,5 @@ target_link_libraries(
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,8 +1,8 @@
aux_source_directory(src CRYPT_SRC) aux_source_directory(src CRYPT_SRC)
IF (TD_ENTERPRISE) IF(TD_ENTERPRISE)
LIST(APPEND CRYPT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/crypt/cryptImpl.c) LIST(APPEND CRYPT_SRC ${TD_ENTERPRISE_DIR}/src/plugins/crypt/cryptImpl.c)
ENDIF () ENDIF()
add_library(crypt STATIC ${CRYPT_SRC}) add_library(crypt STATIC ${CRYPT_SRC})
target_include_directories( target_include_directories(

View File

@ -1,24 +1,25 @@
aux_source_directory(src EXECUTOR_SRC) aux_source_directory(src EXECUTOR_SRC)
add_library(executor STATIC ${EXECUTOR_SRC}) add_library(executor STATIC ${EXECUTOR_SRC})
if(${TD_DARWIN}) if(${TD_DARWIN})
target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype) target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype)
endif(${TD_DARWIN}) endif(${TD_DARWIN})
IF(${BUILD_WITH_ANALYSIS}) if(${BUILD_WITH_ANALYSIS})
add_definitions(-DUSE_ANAL) add_definitions(-DUSE_ANAL)
ENDIF() endif()
target_link_libraries(executor target_link_libraries(executor
PRIVATE os util common function parser planner qcom scalar nodes index wal tdb geometry PRIVATE os util common function parser planner qcom scalar nodes index wal tdb geometry
) )
target_include_directories( target_include_directories(
executor executor
PUBLIC "${TD_SOURCE_DIR}/include/libs/executor" PUBLIC "${TD_SOURCE_DIR}/include/libs/executor"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -5,24 +5,24 @@ add_library(function STATIC ${FUNCTION_SRC} ${FUNCTION_SRC_DETAIL})
target_include_directories( target_include_directories(
function function
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/contrib/libuv/include" "${TD_SOURCE_DIR}/contrib/libuv/include"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc) ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc") SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
ELSE () ELSE()
SET(LINK_JEMALLOC "") SET(LINK_JEMALLOC "")
ENDIF () ENDIF()
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(function jemalloc) ADD_DEPENDENCIES(function jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
function function
@ -39,81 +39,80 @@ target_link_libraries(
add_executable(runUdf test/runUdf.c) add_executable(runUdf test/runUdf.c)
target_include_directories( target_include_directories(
runUdf runUdf
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/contrib/libuv/include" "${TD_SOURCE_DIR}/contrib/libuv/include"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/include/os" "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(runUdf jemalloc) ADD_DEPENDENCIES(runUdf jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
runUdf runUdf
PUBLIC uv_a PUBLIC uv_a
PRIVATE os util common nodes function ${LINK_JEMALLOC} PRIVATE os util common nodes function ${LINK_JEMALLOC}
) )
add_library(udf1 STATIC MODULE test/udf1.c) add_library(udf1 STATIC MODULE test/udf1.c)
target_include_directories( target_include_directories(
udf1 udf1
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/include/os" "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(udf1 jemalloc) ADD_DEPENDENCIES(udf1 jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
udf1 PUBLIC os ${LINK_JEMALLOC}) udf1 PUBLIC os ${LINK_JEMALLOC})
add_library(udf1_dup STATIC MODULE test/udf1_dup.c) add_library(udf1_dup STATIC MODULE test/udf1_dup.c)
target_include_directories( target_include_directories(
udf1_dup udf1_dup
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/include/os" "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(udf1_dup jemalloc) ADD_DEPENDENCIES(udf1_dup jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
udf1_dup PUBLIC os ${LINK_JEMALLOC}) udf1_dup PUBLIC os ${LINK_JEMALLOC})
add_library(udf2 STATIC MODULE test/udf2.c) add_library(udf2 STATIC MODULE test/udf2.c)
target_include_directories( target_include_directories(
udf2 udf2
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/include/os" "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(udf2 jemalloc) ADD_DEPENDENCIES(udf2 jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
udf2 PUBLIC os ${LINK_JEMALLOC} udf2 PUBLIC os ${LINK_JEMALLOC}
@ -121,45 +120,44 @@ target_link_libraries(
add_library(udf2_dup STATIC MODULE test/udf2_dup.c) add_library(udf2_dup STATIC MODULE test/udf2_dup.c)
target_include_directories( target_include_directories(
udf2_dup udf2_dup
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
"${TD_SOURCE_DIR}/include/os" "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(udf2_dup jemalloc) ADD_DEPENDENCIES(udf2_dup jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
udf2_dup PUBLIC os ${LINK_JEMALLOC} udf2_dup PUBLIC os ${LINK_JEMALLOC}
) )
#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin) # SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
add_executable(udfd src/udfd.c) add_executable(udfd src/udfd.c)
target_include_directories( target_include_directories(
udfd udfd
PUBLIC PUBLIC
"${TD_SOURCE_DIR}/include/libs/function" "${TD_SOURCE_DIR}/include/libs/function"
"${TD_SOURCE_DIR}/contrib/libuv/include" "${TD_SOURCE_DIR}/contrib/libuv/include"
"${TD_SOURCE_DIR}/include/util" "${TD_SOURCE_DIR}/include/util"
"${TD_SOURCE_DIR}/include/common" "${TD_SOURCE_DIR}/include/common"
"${TD_SOURCE_DIR}/include/libs/transport" "${TD_SOURCE_DIR}/include/libs/transport"
"${TD_SOURCE_DIR}/include/client" "${TD_SOURCE_DIR}/include/client"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEPENDENCIES(udfd jemalloc) ADD_DEPENDENCIES(udfd jemalloc)
ENDIF () ENDIF()
target_link_libraries( target_link_libraries(
udfd udfd
PUBLIC uv_a PUBLIC uv_a
PRIVATE os util common nodes function ${LINK_JEMALLOC} PRIVATE os util common nodes function ${LINK_JEMALLOC}
) )

View File

@ -1,23 +1,22 @@
aux_source_directory(src INDEX_SRC) aux_source_directory(src INDEX_SRC)
add_library(index STATIC ${INDEX_SRC}) add_library(index STATIC ${INDEX_SRC})
target_include_directories( target_include_directories(
index index
PUBLIC "${TD_SOURCE_DIR}/include/libs/index" PUBLIC "${TD_SOURCE_DIR}/include/libs/index"
PUBLIC "${TD_SOURCE_DIR}/include/os" PUBLIC "${TD_SOURCE_DIR}/include/os"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
target_link_libraries( target_link_libraries(
index index
PUBLIC os PUBLIC os
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
PUBLIC nodes PUBLIC nodes
PUBLIC scalar PUBLIC scalar
PUBLIC function PUBLIC function
) )
if (${BUILD_WITH_LUCENE}) if(${BUILD_WITH_LUCENE})
target_include_directories( target_include_directories(
index index
PUBLIC "${TD_SOURCE_DIR}/deps/lucene/include" PUBLIC "${TD_SOURCE_DIR}/deps/lucene/include"
@ -29,12 +28,10 @@ if (${BUILD_WITH_LUCENE})
) )
endif(${BUILD_WITH_LUCENE}) endif(${BUILD_WITH_LUCENE})
if (${BUILD_WITH_INVERTEDINDEX}) if(${BUILD_WITH_INVERTEDINDEX})
add_definitions(-DUSE_INVERTED_INDEX) add_definitions(-DUSE_INVERTED_INDEX)
endif(${BUILD_WITH_INVERTEDINDEX}) endif(${BUILD_WITH_INVERTEDINDEX})
if(${BUILD_TEST})
if (${BUILD_TEST}) add_subdirectory(test)
add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -9,5 +9,5 @@ target_include_directories(
target_link_libraries(monitor os util common qcom transport monitorfw) target_link_libraries(monitor os util common qcom transport monitorfw)
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -5,7 +5,9 @@ target_include_directories(
PUBLIC "${TD_SOURCE_DIR}/include/libs/monitorfw" PUBLIC "${TD_SOURCE_DIR}/include/libs/monitorfw"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
if(${TD_DARWIN}) if(${TD_DARWIN})
target_compile_options(monitorfw PRIVATE -Wno-error=deprecated-pragma) target_compile_options(monitorfw PRIVATE -Wno-error=deprecated-pragma)
endif(${TD_DARWIN}) endif(${TD_DARWIN})
target_link_libraries(monitorfw os util common transport) target_link_libraries(monitorfw os util common transport)

View File

@ -1,8 +1,8 @@
aux_source_directory(src PARSER_SRC) aux_source_directory(src PARSER_SRC)
IF (TD_ENTERPRISE) IF(TD_ENTERPRISE)
LIST(APPEND PARSER_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/parserView.c) LIST(APPEND PARSER_SRC ${TD_ENTERPRISE_DIR}/src/plugins/view/src/parserView.c)
ENDIF () ENDIF()
add_library(parser STATIC ${PARSER_SRC}) add_library(parser STATIC ${PARSER_SRC})
target_include_directories( target_include_directories(
@ -17,5 +17,5 @@ target_link_libraries(
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -8,8 +8,8 @@ target_include_directories(
) )
TARGET_LINK_LIBRARIES(qworker TARGET_LINK_LIBRARIES(qworker
PRIVATE os util transport nodes planner qcom executor index PRIVATE os util transport nodes planner qcom executor index
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)

View File

@ -13,5 +13,5 @@ target_link_libraries(
) )
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,44 +1,43 @@
aux_source_directory(src STREAM_SRC) aux_source_directory(src STREAM_SRC)
add_library(stream STATIC ${STREAM_SRC}) add_library(stream STATIC ${STREAM_SRC})
target_include_directories( target_include_directories(
stream stream
PUBLIC "${TD_SOURCE_DIR}/include/libs/stream" PUBLIC "${TD_SOURCE_DIR}/include/libs/stream"
PUBLIC "${TD_SOURCE_DIR}/include/libs/tcs" PUBLIC "${TD_SOURCE_DIR}/include/libs/tcs"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
if(${BUILD_WITH_ROCKSDB}) if(${BUILD_WITH_ROCKSDB})
if (${BUILD_CONTRIB}) if(${BUILD_CONTRIB})
target_link_libraries( target_link_libraries(
stream stream
PUBLIC rocksdb tdb tcs PUBLIC rocksdb tdb tcs
PRIVATE os util transport qcom executor wal index PRIVATE os util transport qcom executor wal index
) )
target_include_directories( target_include_directories(
stream stream
PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include" PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
) )
else() else()
if (TD_LINUX) if(TD_LINUX)
target_include_directories( target_include_directories(
stream stream
PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static" PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
) )
target_link_directories( target_link_directories(
stream stream
PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static" PUBLIC "${TD_SOURCE_DIR}/deps/${TD_DEPS_DIR}/rocksdb_static"
) )
target_link_libraries( target_link_libraries(
stream stream
PUBLIC rocksdb tdb tcs PUBLIC rocksdb tdb tcs
PRIVATE os util transport qcom executor wal index PRIVATE os util transport qcom executor wal index
) )
else() else()
target_link_libraries( target_link_libraries(
stream stream
PUBLIC rocksdb tdb tcs PUBLIC rocksdb tdb tcs
PRIVATE os util transport qcom executor wal index PRIVATE os util transport qcom executor wal index
) )
target_include_directories( target_include_directories(
stream stream
@ -46,16 +45,15 @@ if(${BUILD_WITH_ROCKSDB})
) )
endif() endif()
endif() endif()
add_definitions(-DUSE_ROCKSDB) add_definitions(-DUSE_ROCKSDB)
endif(${BUILD_WITH_ROCKSDB}) endif(${BUILD_WITH_ROCKSDB})
# target_link_libraries(
#target_link_libraries( # stream
# stream # PUBLIC tdb
# PUBLIC tdb # PRIVATE os util transport qcom executor
# PRIVATE os util transport qcom executor # )
#)
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,81 +1,77 @@
# bloomFilterTest # bloomFilterTest
#TARGET_LINK_LIBRARIES(streamUpdateTest # TARGET_LINK_LIBRARIES(streamUpdateTest
#PUBLIC os util common gtest gtest_main stream executor index # PUBLIC os util common gtest gtest_main stream executor index
#) # )
#TARGET_INCLUDE_DIRECTORIES( # TARGET_INCLUDE_DIRECTORIES(
#streamUpdateTest # streamUpdateTest
#PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/" # PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
#PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc" # PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
#) # )
#ADD_EXECUTABLE(checkpointTest checkpointTest.cpp) # ADD_EXECUTABLE(checkpointTest checkpointTest.cpp)
#TARGET_LINK_LIBRARIES( # TARGET_LINK_LIBRARIES(
#checkpointTest # checkpointTest
#PUBLIC os common gtest stream executor qcom index transport util # PUBLIC os common gtest stream executor qcom index transport util
#) # )
#TARGET_INCLUDE_DIRECTORIES( # TARGET_INCLUDE_DIRECTORIES(
#checkpointTest # checkpointTest
#PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc" # PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
#) # )
#add_executable(backendTest "") # add_executable(backendTest "")
#target_sources(backendTest # target_sources(backendTest
#PRIVATE # PRIVATE
#"backendTest.cpp" # "backendTest.cpp"
#) # )
#TARGET_LINK_LIBRARIES( # TARGET_LINK_LIBRARIES(
#backendTest # backendTest
#PUBLIC rocksdb # PUBLIC rocksdb
#PUBLIC os common gtest stream executor qcom index transport util # PUBLIC os common gtest stream executor qcom index transport util
#) # )
#TARGET_INCLUDE_DIRECTORIES( # TARGET_INCLUDE_DIRECTORIES(
#backendTest # backendTest
#PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/" # PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
#PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc" # PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
#) # )
#add_test( # add_test(
#NAME streamUpdateTest # NAME streamUpdateTest
#COMMAND streamUpdateTest # COMMAND streamUpdateTest
#) # )
#add_test( # add_test(
#NAME checkpointTest # NAME checkpointTest
#COMMAND checkpointTest # COMMAND checkpointTest
#) # )
#add_test( # add_test(
#NAME backendTest # NAME backendTest
#COMMAND backendTest # COMMAND backendTest
#) # )
# add_executable(backendTest "")
#add_executable(backendTest "") # target_sources(backendTest
# PUBLIC
# "backendTest.cpp"
# )
#target_sources(backendTest # target_include_directories(
#PUBLIC # backendTest
#"backendTest.cpp" # PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
#) # PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
# )
#target_include_directories(
#backendTest
#PUBLIC "${TD_SOURCE_DIR}/include/libs/stream/"
#PRIVATE "${TD_SOURCE_DIR}/source/libs/stream/inc"
#)
#target_link_libraries(
#backendTest
#PUBLIC rocksdb
#PUBLIC os common gtest stream executor qcom index transport util
#)
# target_link_libraries(
# backendTest
# PUBLIC rocksdb
# PUBLIC os common gtest stream executor qcom index transport util
# )
MESSAGE(STATUS "build parser unit test") MESSAGE(STATUS "build parser unit test")
@ -86,9 +82,9 @@ IF(NOT TD_DARWIN)
ADD_EXECUTABLE(backendTest ${SOURCE_LIST}) ADD_EXECUTABLE(backendTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES( TARGET_LINK_LIBRARIES(
backendTest backendTest
PUBLIC rocksdb PUBLIC rocksdb
PUBLIC os common gtest stream executor qcom index transport util vnode PUBLIC os common gtest stream executor qcom index transport util vnode
) )
TARGET_INCLUDE_DIRECTORIES( TARGET_INCLUDE_DIRECTORIES(
@ -98,7 +94,7 @@ IF(NOT TD_DARWIN)
) )
ADD_TEST( ADD_TEST(
NAME backendTest NAME backendTest
COMMAND backendTest COMMAND backendTest
) )
ENDIF () ENDIF()

View File

@ -11,6 +11,7 @@ target_link_libraries(
tcs tcs
PUBLIC az PUBLIC az
PUBLIC common PUBLIC common
# PUBLIC cjson # PUBLIC cjson
# PUBLIC os # PUBLIC os
# PUBLIC util # PUBLIC util

View File

@ -1,22 +1,20 @@
if (TD_LINUX) if(TD_LINUX)
aux_source_directory(. TCS_TEST_SRC)
aux_source_directory(. TCS_TEST_SRC) add_executable(tcsTest ${TCS_TEST_SRC})
target_include_directories(tcsTest
add_executable(tcsTest ${TCS_TEST_SRC}) PUBLIC
target_include_directories(tcsTest "${TD_SOURCE_DIR}/include/libs/tcs"
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
"${TD_SOURCE_DIR}/include/libs/tcs" )
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
target_link_libraries(tcsTest
tcs
gtest_main
)
enable_testing()
add_test(
NAME tcs_test
COMMAND tcsTest
)
target_link_libraries(tcsTest
tcs
gtest_main
)
enable_testing()
add_test(
NAME tcs_test
COMMAND tcsTest
)
endif() endif()

View File

@ -9,5 +9,5 @@ target_include_directories(
target_link_libraries(tfs os util common monitor) target_link_libraries(tfs os util common monitor)
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,34 +1,30 @@
aux_source_directory(src TRANSPORT_SRC) aux_source_directory(src TRANSPORT_SRC)
add_library(transport STATIC ${TRANSPORT_SRC}) add_library(transport STATIC ${TRANSPORT_SRC})
target_include_directories( target_include_directories(
transport transport
PUBLIC "${TD_SOURCE_DIR}/include/libs/transport" PUBLIC "${TD_SOURCE_DIR}/include/libs/transport"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
target_link_libraries( target_link_libraries(
transport transport
PUBLIC lz4_static PUBLIC lz4_static
PUBLIC os PUBLIC os
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
PUBLIC zlibstatic PUBLIC zlibstatic
) )
if (${BUILD_WITH_UV_TRANS})
if (${BUILD_WITH_UV}) if(${BUILD_WITH_UV_TRANS})
target_link_libraries( if(${BUILD_WITH_UV})
transport target_link_libraries(
PUBLIC uv_a transport
) PUBLIC uv_a
add_definitions(-DUSE_UV) )
endif(${BUILD_WITH_UV}) add_definitions(-DUSE_UV)
endif(${BUILD_WITH_UV})
endif(${BUILD_WITH_UV_TRANS}) endif(${BUILD_WITH_UV_TRANS})
if (${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

View File

@ -1,19 +1,20 @@
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.c.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.c") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.c.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/version.c")
aux_source_directory(src UTIL_SRC) aux_source_directory(src UTIL_SRC)
add_library(util STATIC ${UTIL_SRC}) add_library(util STATIC ${UTIL_SRC})
if (DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) if(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG)
endif() endif()
IF (${ASSERT_NOT_CORE}) if(${ASSERT_NOT_CORE})
ADD_DEFINITIONS(-DASSERT_NOT_CORE) ADD_DEFINITIONS(-DASSERT_NOT_CORE)
MESSAGE(STATUS "disable assert core") MESSAGE(STATUS "disable assert core")
ELSE () else()
MESSAGE(STATUS "enable assert core") MESSAGE(STATUS "enable assert core")
ENDIF (${ASSERT_NOT_CORE}) endif(${ASSERT_NOT_CORE})
if(${BUILD_WITH_ANALYSIS}) if(${BUILD_WITH_ANALYSIS})
add_definitions(-DUSE_ANAL) add_definitions(-DUSE_ANAL)
endif() endif()
target_include_directories( target_include_directories(
@ -34,7 +35,7 @@ target_link_directories(
PUBLIC "${TD_SOURCE_DIR}/contrib/pcre2" PUBLIC "${TD_SOURCE_DIR}/contrib/pcre2"
) )
if (TD_LINUX) if(TD_LINUX)
target_link_libraries( target_link_libraries(
util util
PUBLIC os common PUBLIC os common
@ -43,10 +44,10 @@ if (TD_LINUX)
) )
else() else()
target_link_libraries( target_link_libraries(
util util
PUBLIC os common PUBLIC os common
PUBLIC lz4_static pcre2-8 PUBLIC lz4_static pcre2-8
PUBLIC api cjson geos_c TSZ PUBLIC api cjson geos_c TSZ
) )
endif() endif()

View File

@ -1,21 +1,23 @@
IF (TD_WEBSOCKET) IF(TD_WEBSOCKET)
IF (TD_LINUX) IF(TD_LINUX)
SET(websocket_lib_file "libtaosws.so") SET(websocket_lib_file "libtaosws.so")
ELSEIF (TD_DARWIN) ELSEIF(TD_DARWIN)
SET(websocket_lib_file "libtaosws.dylib") SET(websocket_lib_file "libtaosws.dylib")
ENDIF () ENDIF()
MESSAGE("${Green} use libtaos-ws${ColourReset}") MESSAGE("${Green} use libtaos-ws${ColourReset}")
IF (TD_ALPINE)
IF(TD_ALPINE)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(taosws-rs ExternalProject_Add(taosws-rs
PREFIX "taosws-rs" PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off BUILD_ALWAYS off
DEPENDS taos DEPENDS taos
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND PATCH_COMMAND
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls COMMAND RUSTFLAGS=-Ctarget-feature=-crt-static cargo build --release -p taos-ws-sys --features rustls
@ -23,18 +25,18 @@ IF (TD_WEBSOCKET)
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
) )
ELSEIF (TD_WINDOWS) ELSEIF(TD_WINDOWS)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(taosws-rs ExternalProject_Add(taosws-rs
PREFIX "taosws-rs" PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off BUILD_ALWAYS off
DEPENDS taos DEPENDS taos
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND PATCH_COMMAND
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND cargo build --release -p taos-ws-sys --features rustls COMMAND cargo build --release -p taos-ws-sys --features rustls
@ -43,18 +45,18 @@ IF (TD_WEBSOCKET)
COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib COMMAND cp target/release/taosws.dll.lib ${CMAKE_BINARY_DIR}/build/lib/taosws.lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
) )
ELSE() ELSE()
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(taosws-rs ExternalProject_Add(taosws-rs
PREFIX "taosws-rs" PREFIX "taosws-rs"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs
BUILD_ALWAYS off BUILD_ALWAYS off
DEPENDS taos DEPENDS taos
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config"
PATCH_COMMAND PATCH_COMMAND
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND cargo update COMMAND cargo update
COMMAND cargo build --release -p taos-ws-sys --features rustls COMMAND cargo build --release -p taos-ws-sys --features rustls
@ -62,11 +64,11 @@ IF (TD_WEBSOCKET)
COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib COMMAND cp target/release/${websocket_lib_file} ${CMAKE_BINARY_DIR}/build/lib
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include
COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include COMMAND cmake -E copy target/release/taosws.h ${CMAKE_BINARY_DIR}/build/include
) )
ENDIF () ENDIF()
ENDIF () ENDIF()
IF (TD_TAOS_TOOLS) IF(TD_TAOS_TOOLS)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/tools/taos_tools/deps/avro/lang/c/src) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/tools/taos_tools/deps/avro/lang/c/src)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/client) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/client)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/common)
@ -74,69 +76,74 @@ IF (TD_TAOS_TOOLS)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/os) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/os)
INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/libs/transport) INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/include/libs/transport)
ADD_SUBDIRECTORY(taos-tools) ADD_SUBDIRECTORY(taos-tools)
ENDIF () ENDIF()
add_subdirectory(shell) add_subdirectory(shell)
IF (TD_BUILD_HTTP)
IF(TD_BUILD_HTTP)
MESSAGE("") MESSAGE("")
MESSAGE("${Yellow} use original embedded httpd ${ColourReset}") MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
MESSAGE("") MESSAGE("")
# ADD_SUBDIRECTORY(http)
# ADD_SUBDIRECTORY(http)
ELSEIF(TD_BUILD_TAOSA_INTERNAL) ELSEIF(TD_BUILD_TAOSA_INTERNAL)
MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}") MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
ELSE () ELSE()
MESSAGE("") MESSAGE("")
MESSAGE("${Green} use taosadapter as httpd, platform is ${PLATFORM_ARCH_STR} ${ColourReset}") MESSAGE("${Green} use taosadapter as httpd, platform is ${PLATFORM_ARCH_STR} ${ColourReset}")
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND git rev-parse --abbrev-ref HEAD COMMAND git rev-parse --abbrev-ref HEAD
RESULT_VARIABLE result_taos_version RESULT_VARIABLE result_taos_version
OUTPUT_VARIABLE taos_version OUTPUT_VARIABLE taos_version
) )
STRING(FIND ${taos_version} release is_release_branch) STRING(FIND ${taos_version} release is_release_branch)
IF ("${is_release_branch}" STREQUAL "0") IF("${is_release_branch}" STREQUAL "0")
STRING(SUBSTRING "${taos_version}" 12 -1 taos_version) STRING(SUBSTRING "${taos_version}" 12 -1 taos_version)
STRING(STRIP "${taos_version}" taos_version) STRING(STRIP "${taos_version}" taos_version)
ELSE () ELSE()
STRING(CONCAT taos_version "_branch_" "${taos_version}") STRING(CONCAT taos_version "_branch_" "${taos_version}")
STRING(STRIP "${taos_version}" taos_version) STRING(STRIP "${taos_version}" taos_version)
ENDIF () ENDIF()
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
) )
EXECUTE_PROCESS( EXECUTE_PROCESS(
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
COMMAND git rev-parse HEAD COMMAND git rev-parse HEAD
RESULT_VARIABLE commit_sha1 RESULT_VARIABLE commit_sha1
OUTPUT_VARIABLE taosadapter_commit_sha1 OUTPUT_VARIABLE taosadapter_commit_sha1
) )
IF ("${taosadapter_commit_sha1}" STREQUAL "")
IF("${taosadapter_commit_sha1}" STREQUAL "")
SET(taosadapter_commit_sha1 "unknown") SET(taosadapter_commit_sha1 "unknown")
ELSE () ELSE()
# STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1) # STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1)
STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1) STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1)
ENDIF () ENDIF()
SET(taos_version ${TD_VER_NUMBER}) SET(taos_version ${TD_VER_NUMBER})
MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}") MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}")
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND cd .. COMMAND cd ..
) )
MESSAGE("CURRENT SOURCE DIR ${CMAKE_CURRENT_SOURCE_DIR}") MESSAGE("CURRENT SOURCE DIR ${CMAKE_CURRENT_SOURCE_DIR}")
IF (TD_WINDOWS) IF(TD_WINDOWS)
MESSAGE("Building taosAdapter on Windows") MESSAGE("Building taosAdapter on Windows")
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
ExternalProject_Add(taosadapter ExternalProject_Add(taosadapter
PREFIX "taosadapter" PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off BUILD_ALWAYS off
DEPENDS taos DEPENDS taos
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config" CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND PATCH_COMMAND
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client COMMAND set CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client
COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib COMMAND set CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib
@ -153,58 +160,61 @@ ELSE ()
COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E echo "Copy taosadapter-debug.exe" COMMAND cmake -E echo "Copy taosadapter-debug.exe"
COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
) )
ELSEIF (TD_DARWIN) ELSEIF(TD_DARWIN)
MESSAGE("Building taosAdapter on MACOS") MESSAGE("Building taosAdapter on MACOS")
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
ExternalProject_Add(taosadapter ExternalProject_Add(taosadapter
PREFIX "taosadapter" PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off BUILD_ALWAYS off
DEPENDS taos DEPENDS taos
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND
COMMAND git clean -f -d
BUILD_COMMAND
COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-s -w -X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
INSTALL_COMMAND
COMMAND cmake -E echo "Copy taosadapter"
COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E echo "Copy taosadapter.toml"
COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E echo "Copy taosadapter-debug"
COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
)
ELSE ()
MESSAGE("Building taosAdapter on non-Windows")
INCLUDE(ExternalProject)
ExternalProject_Add(taosadapter
PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off
DEPENDS taos
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config" CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND PATCH_COMMAND
COMMAND git clean -f -d COMMAND git clean -f -d
BUILD_COMMAND BUILD_COMMAND
COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'" COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-s -w -X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
# COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'" COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
INSTALL_COMMAND INSTALL_COMMAND
# COMMAND cmake -E echo "Comparessing taosadapter.exe"
# COMMAND upx taosadapter || :
COMMAND cmake -E echo "Copy taosadapter" COMMAND cmake -E echo "Copy taosadapter"
COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E echo "Copy taosadapter.toml" COMMAND cmake -E echo "Copy taosadapter.toml"
COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/ COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
# COMMAND cmake -E echo "Copy taosadapter-debug" COMMAND cmake -E echo "Copy taosadapter-debug"
# COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
) )
ENDIF () ELSE()
ENDIF () MESSAGE("Building taosAdapter on non-Windows")
INCLUDE(ExternalProject)
ExternalProject_Add(taosadapter
PREFIX "taosadapter"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
BUILD_ALWAYS off
DEPENDS taos
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
PATCH_COMMAND
COMMAND git clean -f -d
BUILD_COMMAND
COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
# COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -a -o taosadapter-debug -ldflags "-X 'github.com/taosdata/taosadapter/v3/version.Version=${taos_version}' -X 'github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}' -X 'github.com/taosdata/taosadapter/v3/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
INSTALL_COMMAND
# COMMAND cmake -E echo "Comparessing taosadapter.exe"
# COMMAND upx taosadapter || :
COMMAND cmake -E echo "Copy taosadapter"
COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E echo "Copy taosadapter.toml"
COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
# COMMAND cmake -E echo "Copy taosadapter-debug"
# COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
)
ENDIF()
ENDIF()

View File

@ -2,41 +2,41 @@ aux_source_directory(src SHELL_SRC)
add_executable(shell ${SHELL_SRC}) add_executable(shell ${SHELL_SRC})
IF (TD_LINUX_64 AND JEMALLOC_ENABLED) IF(TD_LINUX_64 AND JEMALLOC_ENABLED)
ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc) ADD_DEFINITIONS(-DTD_JEMALLOC_ENABLED -I${CMAKE_BINARY_DIR}/build/include -L${CMAKE_BINARY_DIR}/build/lib -Wl,-rpath,${CMAKE_BINARY_DIR}/build/lib -ljemalloc)
SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc") SET(LINK_JEMALLOC "-L${CMAKE_BINARY_DIR}/build/lib -ljemalloc")
ADD_DEPENDENCIES(shell jemalloc) ADD_DEPENDENCIES(shell jemalloc)
ELSE () ELSE()
SET(LINK_JEMALLOC "") SET(LINK_JEMALLOC "")
ENDIF () ENDIF()
IF (TD_LINUX AND TD_WEBSOCKET) IF(TD_LINUX AND TD_WEBSOCKET)
ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include -ltaosws) ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include -ltaosws)
SET(LINK_WEBSOCKET "-L${CMAKE_BINARY_DIR}/build/lib -ltaosws") SET(LINK_WEBSOCKET "-L${CMAKE_BINARY_DIR}/build/lib -ltaosws")
ADD_DEPENDENCIES(shell taosws-rs) ADD_DEPENDENCIES(shell taosws-rs)
ELSEIF (TD_DARWIN AND TD_WEBSOCKET) ELSEIF(TD_DARWIN AND TD_WEBSOCKET)
ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include) ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/libtaosws.dylib") SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/libtaosws.dylib")
ADD_DEPENDENCIES(shell taosws-rs) ADD_DEPENDENCIES(shell taosws-rs)
ELSEIF (TD_WINDOWS AND TD_WEBSOCKET) ELSEIF(TD_WINDOWS AND TD_WEBSOCKET)
ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include) ADD_DEFINITIONS(-DWEBSOCKET -I${CMAKE_BINARY_DIR}/build/include)
SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/taosws.lib") SET(LINK_WEBSOCKET "${CMAKE_BINARY_DIR}/build/lib/taosws.lib")
ADD_DEPENDENCIES(shell taosws-rs) ADD_DEPENDENCIES(shell taosws-rs)
ELSE () ELSE()
SET(LINK_WEBSOCKET "") SET(LINK_WEBSOCKET "")
ENDIF () ENDIF()
IF (TD_LINUX AND TD_ALPINE) IF(TD_LINUX AND TD_ALPINE)
SET(LINK_ARGP "/usr/lib/libargp.a") SET(LINK_ARGP "/usr/lib/libargp.a")
ELSE () ELSE()
SET(LINK_ARGP "") SET(LINK_ARGP "")
ENDIF () ENDIF()
if(TD_WINDOWS) if(TD_WINDOWS)
target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET}) target_link_libraries(shell PUBLIC taos_static ${LINK_WEBSOCKET})
else() else()
target_link_libraries(shell PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP}) target_link_libraries(shell PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
endif () endif()
target_link_libraries( target_link_libraries(
shell shell

View File

@ -1,8 +1,8 @@
#ADD_SUBDIRECTORY(examples/c) # ADD_SUBDIRECTORY(examples/c)
ADD_SUBDIRECTORY(tsim) ADD_SUBDIRECTORY(tsim)
ADD_SUBDIRECTORY(test/c) ADD_SUBDIRECTORY(test/c)
#ADD_SUBDIRECTORY(comparisonTest/tdengine)
IF (NOT "${TSZ_ENABLED}" MATCHES "false") # ADD_SUBDIRECTORY(comparisonTest/tdengine)
IF(NOT "${TSZ_ENABLED}" MATCHES "false")
ADD_SUBDIRECTORY(TSZ) ADD_SUBDIRECTORY(TSZ)
ENDIF() ENDIF()

View File

@ -6,22 +6,20 @@ INCLUDE_DIRECTORIES(sz/inc)
INCLUDE_DIRECTORIES(zstd/) INCLUDE_DIRECTORIES(zstd/)
INCLUDE_DIRECTORIES(zstd/common/) INCLUDE_DIRECTORIES(zstd/common/)
# source # source
AUX_SOURCE_DIRECTORY(sz/src SRC1) AUX_SOURCE_DIRECTORY(sz/src SRC1)
AUX_SOURCE_DIRECTORY(zstd/dictBuilder SRC2) AUX_SOURCE_DIRECTORY(zstd/dictBuilder SRC2)
AUX_SOURCE_DIRECTORY(zstd/common SRC3) AUX_SOURCE_DIRECTORY(zstd/common SRC3)
AUX_SOURCE_DIRECTORY(zstd/compress SRC4) AUX_SOURCE_DIRECTORY(zstd/compress SRC4)
AUX_SOURCE_DIRECTORY(zstd/decompress SRC5) AUX_SOURCE_DIRECTORY(zstd/decompress SRC5)
AUX_SOURCE_DIRECTORY(zstd/deprecated SRC6) AUX_SOURCE_DIRECTORY(zstd/deprecated SRC6)
AUX_SOURCE_DIRECTORY(zstd/legacy SRC7) AUX_SOURCE_DIRECTORY(zstd/legacy SRC7)
# archive # archive
ADD_LIBRARY(TSZ STATIC ${SRC1} ${SRC2} ${SRC3} ${SRC4} ${SRC5} ${SRC6} ${SRC7}) ADD_LIBRARY(TSZ STATIC ${SRC1} ${SRC2} ${SRC3} ${SRC4} ${SRC5} ${SRC6} ${SRC7})
TARGET_INCLUDE_DIRECTORIES(TSZ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/sz/inc ${TD_SOURCE_DIR}/include) TARGET_INCLUDE_DIRECTORIES(TSZ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/sz/inc ${TD_SOURCE_DIR}/include)
# windows ignore warning # windows ignore warning
IF (TD_WINDOWS) IF(TD_WINDOWS)
SET_TARGET_PROPERTIES(TSZ PROPERTIES COMPILE_FLAGS -w) SET_TARGET_PROPERTIES(TSZ PROPERTIES COMPILE_FLAGS -w)
ENDIF () ENDIF()

View File

@ -17,7 +17,7 @@ add_executable(varbinary_test varbinary_test.c)
add_executable(replay_test replay_test.c) add_executable(replay_test replay_test.c)
if(${TD_LINUX}) if(${TD_LINUX})
add_executable(tsz_test tsz_test.c) add_executable(tsz_test tsz_test.c)
endif(${TD_LINUX}) endif(${TD_LINUX})
target_link_libraries( target_link_libraries(
@ -124,7 +124,6 @@ target_link_libraries(
PUBLIC common PUBLIC common
PUBLIC os PUBLIC os
PUBLIC geometry PUBLIC geometry
) )
target_link_libraries( target_link_libraries(
@ -144,11 +143,11 @@ target_link_libraries(
) )
if(${TD_LINUX}) if(${TD_LINUX})
target_link_libraries( target_link_libraries(
tsz_test tsz_test
PUBLIC taos PUBLIC taos
PUBLIC util PUBLIC util
PUBLIC common PUBLIC common
PUBLIC os PUBLIC os
) )
endif(${TD_LINUX}) endif(${TD_LINUX})