fix: jemalloc compile error (#17291)
* fix: jemalloc compile error * fix: jemalloc compile error
This commit is contained in:
parent
e081071b71
commit
0b2ff85a17
|
@ -37,6 +37,11 @@ if(${BUILD_WITH_ICONV})
|
||||||
cat("${TD_SUPPORT_DIR}/iconv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
cat("${TD_SUPPORT_DIR}/iconv_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# jemalloc
|
||||||
|
if(${JEMALLOC_ENABLED})
|
||||||
|
cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||||
|
endif()
|
||||||
|
|
||||||
# msvc regex
|
# msvc regex
|
||||||
if(${BUILD_MSVCREGEX})
|
if(${BUILD_MSVCREGEX})
|
||||||
cat("${TD_SUPPORT_DIR}/msvcregex_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
cat("${TD_SUPPORT_DIR}/msvcregex_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
|
||||||
|
@ -258,6 +263,19 @@ if(${BUILD_PTHREAD})
|
||||||
target_link_libraries(pthread INTERFACE libpthreadVC3)
|
target_link_libraries(pthread INTERFACE libpthreadVC3)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# jemalloc
|
||||||
|
if(${JEMALLOC_ENABLED})
|
||||||
|
include(ExternalProject)
|
||||||
|
ExternalProject_Add(jemalloc
|
||||||
|
PREFIX "jemalloc"
|
||||||
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc
|
||||||
|
BUILD_IN_SOURCE 1
|
||||||
|
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --disable-initial-exec-tls
|
||||||
|
BUILD_COMMAND ${MAKE}
|
||||||
|
)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
|
||||||
|
endif()
|
||||||
|
|
||||||
# crashdump
|
# crashdump
|
||||||
if(${BUILD_CRASHDUMP})
|
if(${BUILD_CRASHDUMP})
|
||||||
add_executable(dumper "crashdump/dumper/dumper.c")
|
add_executable(dumper "crashdump/dumper/dumper.c")
|
||||||
|
|
|
@ -14,7 +14,4 @@ target_include_directories(
|
||||||
taosd
|
taosd
|
||||||
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc"
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/node_mgmt/inc"
|
||||||
)
|
)
|
||||||
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
||||||
add_dependencies(taosd jemalloc)
|
|
||||||
ENDIF ()
|
|
||||||
target_link_libraries(taosd dnode)
|
target_link_libraries(taosd dnode)
|
||||||
|
|
|
@ -52,3 +52,7 @@ else()
|
||||||
os PUBLIC dl m rt
|
os PUBLIC dl m rt
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
IF (JEMALLOC_ENABLED)
|
||||||
|
target_link_libraries(os PUBLIC -ljemalloc)
|
||||||
|
ENDIF ()
|
|
@ -28,7 +28,4 @@ target_include_directories(
|
||||||
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
|
||||||
)
|
)
|
||||||
|
|
||||||
IF (TD_LINUX_64 AND JEMALLOC_ENABLED)
|
|
||||||
add_dependencies(taosd jemalloc)
|
|
||||||
ENDIF ()
|
|
||||||
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
|
SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
|
||||||
|
|
Loading…
Reference in New Issue