fix compile errors on macOS 14.4 m2 chip.
This commit is contained in:
parent
5f0a23bbda
commit
195ace04b8
|
@ -251,11 +251,13 @@ target_include_directories(
|
||||||
# zlib
|
# zlib
|
||||||
set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
|
set(CMAKE_PROJECT_INCLUDE_BEFORE "${TD_SUPPORT_DIR}/EnableCMP0048.txt.in")
|
||||||
add_subdirectory(zlib EXCLUDE_FROM_ALL)
|
add_subdirectory(zlib EXCLUDE_FROM_ALL)
|
||||||
|
target_compile_options(zlibstatic PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
zlibstatic
|
zlibstatic
|
||||||
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
|
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
|
||||||
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
|
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/zlib
|
||||||
)
|
)
|
||||||
|
target_compile_options(zlib PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
zlib
|
zlib
|
||||||
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
|
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib
|
||||||
|
|
|
@ -22,7 +22,12 @@ extern "C" {
|
||||||
|
|
||||||
typedef wchar_t TdWchar;
|
typedef wchar_t TdWchar;
|
||||||
typedef int32_t TdUcs4;
|
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;
|
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.
|
// If the error is in a third-party library, place this header file under the third-party library header file.
|
||||||
|
|
|
@ -10,6 +10,8 @@ else()
|
||||||
add_library(taos SHARED ${CLIENT_SRC})
|
add_library(taos SHARED ${CLIENT_SRC})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
target_compile_options(taos PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(jni)
|
INCLUDE_DIRECTORIES(jni)
|
||||||
|
|
||||||
target_include_directories(
|
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
|
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)
|
if(TD_WINDOWS)
|
||||||
INCLUDE_DIRECTORIES(jni/windows)
|
INCLUDE_DIRECTORIES(jni/windows)
|
||||||
INCLUDE_DIRECTORIES(jni/windows/win32)
|
INCLUDE_DIRECTORIES(jni/windows/win32)
|
||||||
|
@ -53,6 +48,9 @@ set_target_properties(
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(taos_static STATIC ${CLIENT_SRC})
|
add_library(taos_static STATIC ${CLIENT_SRC})
|
||||||
|
|
||||||
|
target_compile_options(taos_static PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
taos_static
|
taos_static
|
||||||
PUBLIC "${TD_SOURCE_DIR}/include/client"
|
PUBLIC "${TD_SOURCE_DIR}/include/client"
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
aux_source_directory(src MGMT_SNODE)
|
aux_source_directory(src MGMT_SNODE)
|
||||||
add_library(mgmt_snode STATIC ${MGMT_SNODE})
|
add_library(mgmt_snode STATIC ${MGMT_SNODE})
|
||||||
|
|
||||||
|
target_compile_options(mgmt_snode PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
mgmt_snode
|
mgmt_snode
|
||||||
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
||||||
)
|
)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
mgmt_snode node_util
|
mgmt_snode node_util
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
aux_source_directory(src MGMT_VNODE)
|
aux_source_directory(src MGMT_VNODE)
|
||||||
add_library(mgmt_vnode STATIC ${MGMT_VNODE})
|
add_library(mgmt_vnode STATIC ${MGMT_VNODE})
|
||||||
|
|
||||||
|
target_compile_options(mgmt_vnode PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
mgmt_vnode
|
mgmt_vnode
|
||||||
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
||||||
)
|
)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
mgmt_vnode node_util
|
mgmt_vnode node_util
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
# vnode
|
# vnode
|
||||||
add_subdirectory(src/tqCommon)
|
add_subdirectory(src/tqCommon)
|
||||||
add_library(vnode STATIC "")
|
add_library(vnode STATIC "")
|
||||||
|
|
||||||
|
target_compile_options(vnode PRIVATE -Wno-error=single-bit-bitfield-constant-conversion)
|
||||||
|
|
||||||
set(
|
set(
|
||||||
VNODE_SOURCE_FILES
|
VNODE_SOURCE_FILES
|
||||||
"src/vnd/vnodeOpen.c"
|
"src/vnd/vnodeOpen.c"
|
||||||
|
|
|
@ -2,6 +2,8 @@ aux_source_directory(src EXECUTOR_SRC)
|
||||||
|
|
||||||
add_library(executor STATIC ${EXECUTOR_SRC})
|
add_library(executor STATIC ${EXECUTOR_SRC})
|
||||||
|
|
||||||
|
target_compile_options(executor PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
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
|
||||||
)
|
)
|
||||||
|
|
|
@ -141,6 +141,9 @@ target_link_libraries(
|
||||||
|
|
||||||
#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_compile_options(udfd PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
|
|
||||||
target_include_directories(
|
target_include_directories(
|
||||||
udfd
|
udfd
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
|
|
@ -5,5 +5,5 @@ 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"
|
||||||
)
|
)
|
||||||
|
target_compile_options(monitorfw PRIVATE -Wno-error=deprecated-pragma)
|
||||||
target_link_libraries(monitorfw os util common transport)
|
target_link_libraries(monitorfw os util common transport)
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
aux_source_directory(src SYNC_SRC)
|
aux_source_directory(src SYNC_SRC)
|
||||||
add_library(sync STATIC ${SYNC_SRC})
|
add_library(sync STATIC ${SYNC_SRC})
|
||||||
|
|
||||||
|
target_compile_options(sync PRIVATE -Wno-error=deprecated-non-prototype)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
sync
|
sync
|
||||||
PUBLIC common
|
PUBLIC common
|
||||||
|
|
|
@ -17,10 +17,6 @@
|
||||||
#define _DEFAULT_SOURCE
|
#define _DEFAULT_SOURCE
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
|
|
||||||
#ifndef DISALLOW_NCHAR_WITHOUT_ICONV
|
|
||||||
#include "iconv.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern int wcwidth(wchar_t c);
|
extern int wcwidth(wchar_t c);
|
||||||
extern int wcswidth(const wchar_t *s, size_t n);
|
extern int wcswidth(const wchar_t *s, size_t n);
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ static void shellWriteHistory();
|
||||||
static void shellPrintError(TAOS_RES *tres, int64_t st);
|
static void shellPrintError(TAOS_RES *tres, int64_t st);
|
||||||
static bool shellIsCommentLine(char *line);
|
static bool shellIsCommentLine(char *line);
|
||||||
static void shellSourceFile(const char *file);
|
static void shellSourceFile(const char *file);
|
||||||
static bool shellGetGrantInfo();
|
static bool shellGetGrantInfo(char* buf);
|
||||||
|
|
||||||
static void shellCleanup(void *arg);
|
static void shellCleanup(void *arg);
|
||||||
static void *shellCancelHandler(void *arg);
|
static void *shellCancelHandler(void *arg);
|
||||||
|
|
Loading…
Reference in New Issue