Repository: arrow Updated Branches: refs/heads/master 7e93075cd -> 935279091
ARROW-422: IPC should depend on rapidjson_ep if RapidJSON is vendored Author: Uwe L. Korn <[email protected]> Closes #239 from xhochy/ARROW-422 and squashes the following commits: 1545012 [Uwe L. Korn] ARROW-422: IPC should depend on rapidjson_ep if RapidJSON is vendored Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/93527909 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/93527909 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/93527909 Branch: refs/heads/master Commit: 935279091f371716adcf18f6437244f040f98da8 Parents: 7e93075 Author: Uwe L. Korn <[email protected]> Authored: Wed Dec 14 15:41:44 2016 -0500 Committer: Wes McKinney <[email protected]> Committed: Wed Dec 14 15:41:44 2016 -0500 ---------------------------------------------------------------------- cpp/CMakeLists.txt | 2 ++ cpp/src/arrow/ipc/CMakeLists.txt | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/93527909/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index adcca0e..d288ffb 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -609,8 +609,10 @@ if("$ENV{RAPIDJSON_HOME}" STREQUAL "") 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}) http://git-wip-us.apache.org/repos/asf/arrow/blob/93527909/cpp/src/arrow/ipc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt index 6f401db..b1669c5 100644 --- a/cpp/src/arrow/ipc/CMakeLists.txt +++ b/cpp/src/arrow/ipc/CMakeLists.txt @@ -44,6 +44,9 @@ set(ARROW_IPC_SRCS add_library(arrow_ipc SHARED ${ARROW_IPC_SRCS} ) +if(RAPIDJSON_VERDORED) + add_dependencies(arrow_ipc rapidjson_ep) +endif() if(FLATBUFFERS_VENDORED) add_dependencies(arrow_ipc flatbuffers_ep) endif()
