Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,6 @@ if(ARROW_JEMALLOC)
INTERFACE_INCLUDE_DIRECTORIES
"${CMAKE_CURRENT_BINARY_DIR}/jemalloc_ep-prefix/src")
add_dependencies(jemalloc::jemalloc jemalloc_ep)
add_dependencies(toolchain jemalloc_ep)
endif()

# ----------------------------------------------------------------------
Expand Down
12 changes: 8 additions & 4 deletions cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@ set(ARROW_SRCS
util/utf8.cc
vendored/datetime/tz.cpp)

if(ARROW_JEMALLOC)
if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
set_source_files_properties(memory_pool.cc PROPERTIES OBJECT_DEPENDS jemalloc_ep)
else()
add_dependencies(arrow_dependencies jemalloc_ep)
endif()
endif()

if(ARROW_JSON)
add_subdirectory(json)
set(ARROW_SRCS
Expand Down Expand Up @@ -205,10 +213,6 @@ if(ARROW_CUDA)
add_subdirectory(gpu)
endif()

if(ARROW_JEMALLOC AND JEMALLOC_VENDORED)
add_dependencies(arrow_dependencies jemalloc::jemalloc)
endif()

if(ARROW_WITH_BROTLI)
add_definitions(-DARROW_WITH_BROTLI)
set(ARROW_SRCS util/compression_brotli.cc ${ARROW_SRCS})
Expand Down