xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

4
source/client/CMakeLists.txt
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)

35
source/common/CMakeLists.txt
View File

@ -1,7 +1,8 @@
aux_source_directory(src COMMON_SRC) aux_source_directory(src COMMON_SRC)
IF (TD_ENTERPRISE)
if(TD_ENTERPRISE)
LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c) LIST(APPEND COMMON_SRC ${TD_ENTERPRISE_DIR}/src/plugins/common/src/tglobal.c)
ENDIF() endif()
add_library(common STATIC ${COMMON_SRC}) add_library(common STATIC ${COMMON_SRC})
@ -9,22 +10,22 @@ 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
@ -32,13 +33,14 @@ target_include_directories(
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})
if(${TD_WINDOWS})
target_include_directories( target_include_directories(
common common
PRIVATE "${TD_SOURCE_DIR}/contrib/pthread" PRIVATE "${TD_SOURCE_DIR}/contrib/pthread"
PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex" PRIVATE "${TD_SOURCE_DIR}/contrib/msvcregex"
) )
ENDIF () endif()
target_link_libraries( target_link_libraries(
common common
@ -48,7 +50,6 @@ target_link_libraries(
) )
if(${BUILD_S3}) if(${BUILD_S3})
if(${BUILD_WITH_S3}) if(${BUILD_WITH_S3})
target_include_directories( target_include_directories(
common common
@ -78,7 +79,6 @@ if(${BUILD_S3})
endif() endif()
if(${BUILD_WITH_COS}) if(${BUILD_WITH_COS})
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/) 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(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
@ -97,13 +97,15 @@ if(${BUILD_S3})
# s3 # s3
FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/) 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)
if(APR_CONFIG_BIN)
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${APR_CONFIG_BIN} --includedir COMMAND ${APR_CONFIG_BIN} --includedir
OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_VARIABLE APR_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
ENDIF() endif()
include_directories(${APR_INCLUDE_DIR}) include_directories(${APR_INCLUDE_DIR})
target_include_directories( target_include_directories(
common common
@ -113,7 +115,6 @@ if(${BUILD_S3})
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
endif(${BUILD_WITH_COS}) endif(${BUILD_WITH_COS})
endif() endif()
if(${BUILD_TEST}) if(${BUILD_TEST})

1
source/dnode/mgmt/CMakeLists.txt
View File

@ -35,4 +35,3 @@ IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
ELSE() ELSE()
target_link_libraries(taosd dnode crypt) target_link_libraries(taosd dnode crypt)
ENDIF() ENDIF()

7
source/dnode/mgmt/mgmt_dnode/CMakeLists.txt
View File

@ -1,18 +1,19 @@
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

26
source/dnode/mnode/impl/CMakeLists.txt
View File

@ -1,24 +1,26 @@
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(
@ -30,14 +32,14 @@ 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)

17
source/dnode/vnode/CMakeLists.txt
View File

@ -1,9 +1,11 @@
# 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"
@ -71,7 +73,6 @@ 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)
@ -87,7 +88,7 @@ target_sources(
${VNODE_SOURCE_FILES} ${VNODE_SOURCE_FILES}
) )
IF (TD_VNODE_PLUGINS) if(TD_VNODE_PLUGINS)
target_sources( target_sources(
vnode vnode
PRIVATE PRIVATE
@ -95,9 +96,9 @@ IF (TD_VNODE_PLUGINS)
${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"
@ -112,8 +113,7 @@ ENDIF ()
# 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
@ -135,6 +135,7 @@ 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}) if(${TD_LINUX})
target_include_directories( target_include_directories(
vnode vnode
@ -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)

1
source/libs/audit/CMakeLists.txt
View File

@ -1,4 +1,5 @@
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()

1
source/libs/azure/CMakeLists.txt
View File

@ -29,4 +29,5 @@ target_link_libraries(
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})
# endif(${TD_LINUX}) # endif(${TD_LINUX})

2
source/libs/azure/test/CMakeLists.txt
View File

@ -1,5 +1,4 @@
if(TD_LINUX) if(TD_LINUX)
aux_source_directory(. AZ_TEST_SRC) aux_source_directory(. AZ_TEST_SRC)
add_executable(azTest ${AZ_TEST_SRC}) add_executable(azTest ${AZ_TEST_SRC})
@ -18,5 +17,4 @@ add_test(
NAME az_test NAME az_test
COMMAND azTest COMMAND azTest
) )
endif(TD_LINUX) endif(TD_LINUX)

5
source/libs/executor/CMakeLists.txt
View File

@ -1,13 +1,14 @@
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

2
source/libs/function/CMakeLists.txt
View File

@ -79,7 +79,6 @@ 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
@ -162,4 +161,3 @@ target_link_libraries(
PUBLIC uv_a PUBLIC uv_a
PRIVATE os util common nodes function ${LINK_JEMALLOC} PRIVATE os util common nodes function ${LINK_JEMALLOC}
) )

3
source/libs/index/CMakeLists.txt
View File

@ -5,7 +5,6 @@ target_include_directories(
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
@ -33,8 +32,6 @@ 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})

2
source/libs/monitorfw/CMakeLists.txt
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)

4
source/libs/stream/CMakeLists.txt
View File

@ -7,7 +7,6 @@ target_include_directories(
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(
@ -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})

4
source/libs/stream/test/CMakeLists.txt
View File

@ -1,5 +1,3 @@
# bloomFilterTest # bloomFilterTest
# TARGET_LINK_LIBRARIES(streamUpdateTest # TARGET_LINK_LIBRARIES(streamUpdateTest
@ -56,7 +54,6 @@
# COMMAND backendTest # COMMAND backendTest
# ) # )
# add_executable(backendTest "") # add_executable(backendTest "")
# target_sources(backendTest # target_sources(backendTest
@ -76,7 +73,6 @@
# PUBLIC os common gtest stream executor qcom index transport util # PUBLIC os common gtest stream executor qcom index transport util
# ) # )
MESSAGE(STATUS "build parser unit test") MESSAGE(STATUS "build parser unit test")
IF(NOT TD_DARWIN) IF(NOT TD_DARWIN)

1
source/libs/tcs/CMakeLists.txt
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

2
source/libs/tcs/test/CMakeLists.txt
View File

@ -1,5 +1,4 @@
if(TD_LINUX) if(TD_LINUX)
aux_source_directory(. TCS_TEST_SRC) aux_source_directory(. TCS_TEST_SRC)
add_executable(tcsTest ${TCS_TEST_SRC}) add_executable(tcsTest ${TCS_TEST_SRC})
@ -18,5 +17,4 @@ add_test(
NAME tcs_test NAME tcs_test
COMMAND tcsTest COMMAND tcsTest
) )
endif() endif()

6
source/libs/transport/CMakeLists.txt
View File

@ -14,6 +14,7 @@ target_link_libraries(
PUBLIC common PUBLIC common
PUBLIC zlibstatic PUBLIC zlibstatic
) )
if(${BUILD_WITH_UV_TRANS}) if(${BUILD_WITH_UV_TRANS})
if(${BUILD_WITH_UV}) if(${BUILD_WITH_UV})
target_link_libraries( target_link_libraries(
@ -27,8 +28,3 @@ endif(${BUILD_WITH_UV_TRANS})
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)
endif(${BUILD_TEST}) endif(${BUILD_TEST})

7
source/util/CMakeLists.txt
View File

@ -1,16 +1,17 @@
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) if(DEFINED GRANT_CFG_INCLUDE_DIR)
add_definitions(-DGRANTS_CFG) 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)

10
tools/CMakeLists.txt
View File

@ -4,7 +4,9 @@ IF (TD_WEBSOCKET)
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
@ -77,10 +79,12 @@ IF (TD_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}")
@ -103,6 +107,7 @@ 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
) )
@ -112,12 +117,14 @@ ELSE ()
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(
@ -193,8 +200,10 @@ ELSE ()
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 "-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 cmake -E echo "Comparessing taosadapter.exe"
# COMMAND upx taosadapter || : # COMMAND upx taosadapter || :
COMMAND cmake -E echo "Copy taosadapter" COMMAND cmake -E echo "Copy taosadapter"
@ -203,6 +212,7 @@ ELSE ()
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
) )

2
utils/CMakeLists.txt
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)
# ADD_SUBDIRECTORY(comparisonTest/tdengine)
IF(NOT "${TSZ_ENABLED}" MATCHES "false") IF(NOT "${TSZ_ENABLED}" MATCHES "false")
ADD_SUBDIRECTORY(TSZ) ADD_SUBDIRECTORY(TSZ)
ENDIF() ENDIF()

2
utils/TSZ/CMakeLists.txt
View File

@ -6,7 +6,6 @@ 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)
@ -16,7 +15,6 @@ 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)

1
utils/test/c/CMakeLists.txt
View File

@ -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(