From 1456d027b7cf797905376b7912b0c8c4af4c31e5 Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Wed, 6 Nov 2024 15:11:27 +0800 Subject: [PATCH] fix: lemon_sqll depends --- source/common/CMakeLists.txt | 2 +- source/libs/parser/CMakeLists.txt | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index 64709e1d34..f10eb6a611 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -6,7 +6,7 @@ endif() add_library(common STATIC ${COMMON_SRC}) -add_dependencies(common lemon_target) +add_dependencies(common lemon_sql) if(DEFINED GRANT_CFG_INCLUDE_DIR) add_definitions(-DGRANTS_CFG) diff --git a/source/libs/parser/CMakeLists.txt b/source/libs/parser/CMakeLists.txt index d6c9810603..bd2dd95ee0 100644 --- a/source/libs/parser/CMakeLists.txt +++ b/source/libs/parser/CMakeLists.txt @@ -5,11 +5,11 @@ IF(TD_ENTERPRISE) ENDIF() add_custom_command( - OUTPUT ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c + OUTPUT ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c ${TD_SOURCE_DIR}/include/common/ttokenauto.h COMMAND echo "Running lemon process in ${TD_SOURCE_DIR}/source/libs/parser/inc" COMMAND ${TD_CONTRIB_DIR}/lemon/lemon sql.y || true COMMAND echo "copy sql.c from ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.c to ${TD_SOURCE_DIR}/source/libs/parser/src/" - COMMAND mv ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.c ${TD_SOURCE_DIR}/source/libs/parser/src/ + COMMAND mv ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.c ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c COMMAND mv ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.h ${TD_SOURCE_DIR}/include/common/ttokenauto.h COMMAND echo "lemon process completed." DEPENDS ${TD_SOURCE_DIR}/source/libs/parser/inc/sql.y @@ -17,15 +17,14 @@ add_custom_command( COMMENT "Generating sql.c using lemon" ) -add_custom_target(lemon_target ALL - DEPENDS ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c - DEPENDS ${TD_SOURCE_DIR}/include/common/ttokenauto.h +add_custom_target(lemon_sql ALL + DEPENDS ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c ${TD_SOURCE_DIR}/include/common/ttokenauto.h ) list(APPEND PARSER_SRC ${TD_SOURCE_DIR}/source/libs/parser/src/sql.c) add_library(parser STATIC ${PARSER_SRC}) -add_dependencies(parser lemon_target) +add_dependencies(parser lemon_sql) target_include_directories( parser PUBLIC "${TD_SOURCE_DIR}/include/libs/parser"