Repository: arrow Updated Branches: refs/heads/master 5e3430981 -> 222628c9d
ARROW-1140: [C++] Allow optional build of plasma Author: Phillip Cloud <cpcl...@gmail.com> Closes #767 from cpcloud/ARROW-1140 and squashes the following commits: b046215c [Phillip Cloud] ARROW-1140: [C++] Allow optional build of plasma Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/222628c9 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/222628c9 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/222628c9 Branch: refs/heads/master Commit: 222628c9d86c27800e94311fb33c2edd36ee623b Parents: 5e34309 Author: Phillip Cloud <cpcl...@gmail.com> Authored: Thu Jun 22 17:30:33 2017 -0400 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Thu Jun 22 17:30:33 2017 -0400 ---------------------------------------------------------------------- ci/travis_before_script_cpp.sh | 3 ++- ci/travis_script_python.sh | 1 + cpp/CMakeLists.txt | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/222628c9/ci/travis_before_script_cpp.sh ---------------------------------------------------------------------- diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh index a38a0dc..3a1836c 100755 --- a/ci/travis_before_script_cpp.sh +++ b/ci/travis_before_script_cpp.sh @@ -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="" http://git-wip-us.apache.org/repos/asf/arrow/blob/222628c9/ci/travis_script_python.sh ---------------------------------------------------------------------- diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh index b82653d..8585527 100755 --- a/ci/travis_script_python.sh +++ b/ci/travis_script_python.sh @@ -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 http://git-wip-us.apache.org/repos/asf/arrow/blob/222628c9/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 0897e99..5ba56e5 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -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) @@ -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)