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
3 changes: 2 additions & 1 deletion ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ pushd $ARROW_CPP_BUILD_DIR

CMAKE_COMMON_FLAGS="\
-DARROW_BUILD_BENCHMARKS=ON \
-DCMAKE_INSTALL_PREFIX=$ARROW_CPP_INSTALL
-DCMAKE_INSTALL_PREFIX=$ARROW_CPP_INSTALL \
-DARROW_PLASMA=ON \
-DARROW_NO_DEPRECATED_API=ON"
CMAKE_LINUX_FLAGS=""
CMAKE_OSX_FLAGS=""
Expand Down
1 change: 1 addition & 0 deletions ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ function build_arrow_libraries() {
cmake -DARROW_BUILD_TESTS=off \
-DARROW_PYTHON=on \
-DPLASMA_PYTHON=on \
-DARROW_PLASMA=on \
-DCMAKE_INSTALL_PREFIX=$2 \
$CPP_DIR

Expand Down
8 changes: 7 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
option(ARROW_RPATH_ORIGIN
"Build Arrow libraries with RATH set to \$ORIGIN"
OFF)

option(ARROW_PLASMA
"Build the plasma object store along with Arrow"
OFF)
endif()

if(ARROW_BUILD_TESTS)
Expand Down Expand Up @@ -1013,11 +1017,13 @@ if(FLATBUFFERS_VENDORED)
set(ARROW_DEPENDENCIES ${ARROW_DEPENDENCIES} flatbuffers_ep)
endif()

if(NOT WIN32)
if(NOT WIN32 AND ARROW_PLASMA)
add_subdirectory(src/plasma)
endif()

add_subdirectory(src/arrow)
add_subdirectory(src/arrow/io)

if (ARROW_IPC)
add_subdirectory(src/arrow/ipc)
set(ARROW_DEPENDENCIES ${ARROW_DEPENDENCIES} metadata_fbs)
Expand Down