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

fix compile errors on macOS 14.4 m2 chip.

This commit is contained in:
Jacob Su 2024-04-19 10:28:37 +08:00
parent 5f0a23bbda
commit 195ace04b8
12 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/CMakeLists.txt
View File

@ -251,11 +251,13 @@ target_include_directories(
# zlib
set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
add_subdirectory(zlib EXCLUDE_FROM_ALL)
target_compile_options(zlibstatic PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
zlibstatic
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
)
target_compile_options(zlib PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
zlib
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib

7
include/os/osString.h
View File

@ -22,7 +22,12 @@ extern "C" {
typedef wchar_t TdWchar;
typedef int32_t TdUcs4;
typedef void *iconv_t;
#ifndef DISALLOW_NCHAR_WITHOUT_ICONV
#include "iconv.h"
#else
typedef void *iconv_t;
#endif
typedef enum { M2C = 0, C2M } ConvType;
// If the error is in a third-party library, place this header file under the third-party library header file.

12
source/client/CMakeLists.txt
View File

@ -10,6 +10,8 @@ else()
add_library(taos SHARED ${CLIENT_SRC})
endif()
target_compile_options(taos PRIVATE -Wno-error=deprecated-non-prototype)
INCLUDE_DIRECTORIES(jni)
target_include_directories(
@ -23,13 +25,6 @@ target_link_libraries(
PRIVATE os util common transport monitor nodes parser command planner catalog scheduler function qcom geometry
)
if(TD_DARWIN_ARM64)
target_link_libraries(
taos
PRIVATE "-arch x86_64"
)
endif()
if(TD_WINDOWS)
INCLUDE_DIRECTORIES(jni/windows)
INCLUDE_DIRECTORIES(jni/windows/win32)
@ -53,6 +48,9 @@ set_target_properties(
)
add_library(taos_static STATIC ${CLIENT_SRC})
target_compile_options(taos_static PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
taos_static
PUBLIC "${TD_SOURCE_DIR}/include/client"

5
source/dnode/mgmt/mgmt_snode/CMakeLists.txt
View File

@ -1,9 +1,12 @@
aux_source_directory(src MGMT_SNODE)
add_library(mgmt_snode STATIC ${MGMT_SNODE})
target_compile_options(mgmt_snode PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
mgmt_snode
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
)
target_link_libraries(
mgmt_snode node_util
)
)

5
source/dnode/mgmt/mgmt_vnode/CMakeLists.txt
View File

@ -1,9 +1,12 @@
aux_source_directory(src MGMT_VNODE)
add_library(mgmt_vnode STATIC ${MGMT_VNODE})
target_compile_options(mgmt_vnode PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
mgmt_vnode
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
)
target_link_libraries(
mgmt_vnode node_util
)
)

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

@ -1,6 +1,9 @@
# vnode
add_subdirectory(src/tqCommon)
add_library(vnode STATIC "")
target_compile_options(vnode PRIVATE -Wno-error=single-bit-bitfield-constant-conversion)
set(
VNODE_SOURCE_FILES
"src/vnd/vnodeOpen.c"

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

@ -2,6 +2,8 @@ aux_source_directory(src EXECUTOR_SRC)
add_library(executor STATIC ${EXECUTOR_SRC})
target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype)
target_link_libraries(executor
PRIVATE os util common function parser planner qcom scalar nodes index wal tdb geometry
)

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

@ -141,6 +141,9 @@ target_link_libraries(
#SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/build/bin)
add_executable(udfd src/udfd.c)
target_compile_options(udfd PRIVATE -Wno-error=deprecated-non-prototype)
target_include_directories(
udfd
PUBLIC

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

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

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

@ -1,6 +1,7 @@
aux_source_directory(src SYNC_SRC)
add_library(sync STATIC ${SYNC_SRC})
target_compile_options(sync PRIVATE -Wno-error=deprecated-non-prototype)
target_link_libraries(
sync
PUBLIC common

4
source/os/src/osString.c
View File

@ -17,10 +17,6 @@
#define _DEFAULT_SOURCE
#include "os.h"
#ifndef DISALLOW_NCHAR_WITHOUT_ICONV
#include "iconv.h"
#endif
extern int wcwidth(wchar_t c);
extern int wcswidth(const wchar_t *s, size_t n);

2
tools/shell/src/shellEngine.c
View File

@ -56,7 +56,7 @@ static void shellWriteHistory();
static void shellPrintError(TAOS_RES *tres, int64_t st);
static bool shellIsCommentLine(char *line);
static void shellSourceFile(const char *file);
static bool shellGetGrantInfo();
static bool shellGetGrantInfo(char* buf);
static void shellCleanup(void *arg);
static void *shellCancelHandler(void *arg);