fix: PR error
This commit is contained in:
parent
efa6db2150
commit
3ce942f5fb
|
@ -2,21 +2,6 @@ aux_source_directory(src SHELL_SRC)
|
||||||
|
|
||||||
add_executable(shell ${SHELL_SRC})
|
add_executable(shell ${SHELL_SRC})
|
||||||
|
|
||||||
# include
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
|
|
||||||
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellMain.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellAuto.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellTire.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellArguments.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellCommand.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellEngine.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellUtil.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellNettest.c)
|
|
||||||
LIST(APPEND SHELL_UT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/shellWebsocket.c)
|
|
||||||
|
|
||||||
# shell_ut library
|
|
||||||
add_library(shell_ut STATIC ${SHELL_UT_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)
|
||||||
|
@ -30,17 +15,13 @@ 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)
|
||||||
ADD_DEPENDENCIES(shell_ut 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_ut 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)
|
||||||
ADD_DEPENDENCIES(shell_ut taosws-rs)
|
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(LINK_WEBSOCKET "")
|
SET(LINK_WEBSOCKET "")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
@ -73,18 +54,17 @@ SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
|
||||||
# generator library shell_ut for uint test
|
# generator library shell_ut for uint test
|
||||||
#
|
#
|
||||||
|
|
||||||
# link public
|
IF(TD_LINUX)
|
||||||
if(TD_WINDOWS)
|
# include
|
||||||
target_link_libraries(shell_ut PUBLIC taos_static ${LINK_WEBSOCKET})
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
|
||||||
else()
|
# shell_ut library
|
||||||
target_link_libraries(shell_ut PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
|
add_library(shell_ut STATIC ${SHELL_SRC})
|
||||||
endif()
|
|
||||||
|
|
||||||
# link private
|
IF(TD_WEBSOCKET)
|
||||||
target_link_libraries(
|
ADD_DEPENDENCIES(shell_ut taosws-rs)
|
||||||
shell_ut
|
ENDIF()
|
||||||
PRIVATE os common transport geometry util
|
target_link_libraries(shell_ut PUBLIC taos ${LINK_WEBSOCKET} ${LINK_JEMALLOC} ${LINK_ARGP})
|
||||||
)
|
target_link_libraries(shell_ut PRIVATE os common transport geometry util)
|
||||||
|
|
||||||
# util depends
|
# util depends
|
||||||
target_link_directories(
|
target_link_directories(
|
||||||
|
@ -94,6 +74,7 @@ target_link_directories(
|
||||||
)
|
)
|
||||||
|
|
||||||
# unit test
|
# unit test
|
||||||
if(${BUILD_TEST})
|
IF(${BUILD_TEST})
|
||||||
ADD_SUBDIRECTORY(test)
|
ADD_SUBDIRECTORY(test)
|
||||||
endif(${BUILD_TEST})
|
ENDIF(${BUILD_TEST})
|
||||||
|
ENDIF()
|
||||||
|
|
Loading…
Reference in New Issue