You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2017/04/15 09:27:50 UTC
arrow git commit: ARROW-820: [C++] Build dependencies for Parquet library without arrow…
Repository: arrow
Updated Branches:
refs/heads/master 4b030dd0e -> ce5b98e1d
ARROW-820: [C++] Build dependencies for Parquet library without arrow\u2026
\u2026 support
Author: Deepak Majeti <de...@hpe.com>
Closes #538 from majetideepak/ARROW-820 and squashes the following commits:
10ca617 [Deepak Majeti] Revert HDFS change
f399ab5 [Deepak Majeti] Add flags for ARROW_IPC and ARROW_HDFS
add683a [Deepak Majeti] ARROW-820: [C++] Build dependencies for Parquet library without arrow support
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/ce5b98e1
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/ce5b98e1
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/ce5b98e1
Branch: refs/heads/master
Commit: ce5b98e1d8254219419220c42e45959ca1aeac21
Parents: 4b030dd
Author: Deepak Majeti <de...@hpe.com>
Authored: Sat Apr 15 11:27:46 2017 +0200
Committer: Uwe L. Korn <uw...@xhochy.com>
Committed: Sat Apr 15 11:27:46 2017 +0200
----------------------------------------------------------------------
cpp/CMakeLists.txt | 107 ++++++++++++++++++++++++++----------------------
1 file changed, 57 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/ce5b98e1/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 0e4a4bb..83610d3 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -621,27 +621,49 @@ if(ARROW_BUILD_BENCHMARKS)
endif()
endif()
-# RapidJSON, header only dependency
-if("$ENV{RAPIDJSON_HOME}" STREQUAL "")
- ExternalProject_Add(rapidjson_ep
- PREFIX "${CMAKE_BINARY_DIR}"
- URL "https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz"
- URL_MD5 "badd12c511e081fec6c89c43a7027bce"
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- BUILD_IN_SOURCE 1
- INSTALL_COMMAND "")
-
- ExternalProject_Get_Property(rapidjson_ep SOURCE_DIR)
- set(RAPIDJSON_INCLUDE_DIR "${SOURCE_DIR}/include")
- set(RAPIDJSON_VENDORED 1)
-else()
- set(RAPIDJSON_INCLUDE_DIR "$ENV{RAPIDJSON_HOME}/include")
- set(RAPIDJSON_VENDORED 0)
-endif()
-message(STATUS "RapidJSON include dir: ${RAPIDJSON_INCLUDE_DIR}")
-include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR})
+if (ARROW_IPC)
+ # RapidJSON, header only dependency
+ if("$ENV{RAPIDJSON_HOME}" STREQUAL "")
+ ExternalProject_Add(rapidjson_ep
+ PREFIX "${CMAKE_BINARY_DIR}"
+ URL "https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz"
+ URL_MD5 "badd12c511e081fec6c89c43a7027bce"
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ BUILD_IN_SOURCE 1
+ INSTALL_COMMAND "")
+
+ ExternalProject_Get_Property(rapidjson_ep SOURCE_DIR)
+ set(RAPIDJSON_INCLUDE_DIR "${SOURCE_DIR}/include")
+ set(RAPIDJSON_VENDORED 1)
+ else()
+ set(RAPIDJSON_INCLUDE_DIR "$ENV{RAPIDJSON_HOME}/include")
+ set(RAPIDJSON_VENDORED 0)
+ endif()
+ message(STATUS "RapidJSON include dir: ${RAPIDJSON_INCLUDE_DIR}")
+ include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR})
+
+ ## Flatbuffers
+ if("$ENV{FLATBUFFERS_HOME}" STREQUAL "")
+ set(FLATBUFFERS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers_ep-prefix/src/flatbuffers_ep-install")
+ ExternalProject_Add(flatbuffers_ep
+ URL "https://github.com/google/flatbuffers/archive/v${FLATBUFFERS_VERSION}.tar.gz"
+ CMAKE_ARGS
+ "-DCMAKE_INSTALL_PREFIX:PATH=${FLATBUFFERS_PREFIX}"
+ "-DFLATBUFFERS_BUILD_TESTS=OFF")
+
+ set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_PREFIX}/include")
+ set(FLATBUFFERS_COMPILER "${FLATBUFFERS_PREFIX}/bin/flatc")
+ set(FLATBUFFERS_VENDORED 1)
+ else()
+ find_package(Flatbuffers REQUIRED)
+ set(FLATBUFFERS_VENDORED 0)
+ endif()
+ message(STATUS "Flatbuffers include dir: ${FLATBUFFERS_INCLUDE_DIR}")
+ message(STATUS "Flatbuffers compiler: ${FLATBUFFERS_COMPILER}")
+ include_directories(SYSTEM ${FLATBUFFERS_INCLUDE_DIR})
+endif()
#----------------------------------------------------------------------
if (MSVC)
@@ -705,28 +727,6 @@ endif()
# set(ARROW_TCMALLOC_AVAILABLE 1)
# endif()
-## Flatbuffers
-
-if("$ENV{FLATBUFFERS_HOME}" STREQUAL "")
- set(FLATBUFFERS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers_ep-prefix/src/flatbuffers_ep-install")
- ExternalProject_Add(flatbuffers_ep
- URL "https://github.com/google/flatbuffers/archive/v${FLATBUFFERS_VERSION}.tar.gz"
- CMAKE_ARGS
- "-DCMAKE_INSTALL_PREFIX:PATH=${FLATBUFFERS_PREFIX}"
- "-DFLATBUFFERS_BUILD_TESTS=OFF")
-
- set(FLATBUFFERS_INCLUDE_DIR "${FLATBUFFERS_PREFIX}/include")
- set(FLATBUFFERS_COMPILER "${FLATBUFFERS_PREFIX}/bin/flatc")
- set(FLATBUFFERS_VENDORED 1)
-else()
- find_package(Flatbuffers REQUIRED)
- set(FLATBUFFERS_VENDORED 0)
-endif()
-
-message(STATUS "Flatbuffers include dir: ${FLATBUFFERS_INCLUDE_DIR}")
-message(STATUS "Flatbuffers compiler: ${FLATBUFFERS_COMPILER}")
-include_directories(SYSTEM ${FLATBUFFERS_INCLUDE_DIR})
-
########################################################################
# HDFS thirdparty setup
@@ -885,7 +885,9 @@ endif()
add_subdirectory(src/arrow)
add_subdirectory(src/arrow/io)
-add_subdirectory(src/arrow/ipc)
+if (ARROW_IPC)
+ add_subdirectory(src/arrow/ipc)
+endif()
set(ARROW_DEPENDENCIES ${ARROW_DEPENDENCIES} metadata_fbs)
@@ -909,17 +911,22 @@ set(ARROW_SRCS
src/arrow/io/interfaces.cc
src/arrow/io/memory.cc
- src/arrow/ipc/feather.cc
- src/arrow/ipc/json.cc
- src/arrow/ipc/json-internal.cc
- src/arrow/ipc/metadata.cc
- src/arrow/ipc/reader.cc
- src/arrow/ipc/writer.cc
-
src/arrow/util/bit-util.cc
src/arrow/util/decimal.cc
)
+if (ARROW_IPC)
+ set(ARROW_SRCS ${ARROW_SRCS}
+ src/arrow/ipc/feather.cc
+ src/arrow/ipc/json.cc
+ src/arrow/ipc/json-internal.cc
+ src/arrow/ipc/metadata.cc
+ src/arrow/ipc/reader.cc
+ src/arrow/ipc/writer.cc
+ )
+endif()
+
+
if(NOT APPLE AND NOT MSVC)
# Localize thirdparty symbols using a linker version script. This hides them
# from the client application. The OS X linker does not support the