Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B41BE200CD4 for ; Sat, 24 Jun 2017 01:33:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B15D0160BE5; Fri, 23 Jun 2017 23:33:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 07EE3160BF2 for ; Sat, 24 Jun 2017 01:33:06 +0200 (CEST) Received: (qmail 1603 invoked by uid 500); 23 Jun 2017 23:33:06 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 1586 invoked by uid 99); 23 Jun 2017 23:33:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jun 2017 23:33:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1B914DFAF5; Fri, 23 Jun 2017 23:33:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: <3cff2da8b058473588b76d559841fb9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-1147: [C++] Allow optional vendoring of flatbuffers in plasma Date: Fri, 23 Jun 2017 23:33:06 +0000 (UTC) archived-at: Fri, 23 Jun 2017 23:33:07 -0000 Repository: arrow Updated Branches: refs/heads/master 98f7cac6e -> 73007de72 ARROW-1147: [C++] Allow optional vendoring of flatbuffers in plasma Author: Phillip Cloud Closes #780 from cpcloud/ARROW-1147 and squashes the following commits: 2deec3f2 [Phillip Cloud] Move target ea9df3a4 [Phillip Cloud] ARROW-1147: [C++] Allow optional vendoring of flatbuffers in plasma Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/73007de7 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/73007de7 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/73007de7 Branch: refs/heads/master Commit: 73007de727f07efdf91c4832b1284079fba59d77 Parents: 98f7cac Author: Phillip Cloud Authored: Fri Jun 23 19:33:01 2017 -0400 Committer: Wes McKinney Committed: Fri Jun 23 19:33:01 2017 -0400 ---------------------------------------------------------------------- cpp/src/plasma/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/73007de7/cpp/src/plasma/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt index 8f2d81f..4ff3beb 100644 --- a/cpp/src/plasma/CMakeLists.txt +++ b/cpp/src/plasma/CMakeLists.txt @@ -46,6 +46,12 @@ set(PLASMA_FBS_OUTPUT_FILES "${OUTPUT_DIR}/common_generated.h" "${OUTPUT_DIR}/plasma_generated.h") +add_custom_target(gen_plasma_fbs DEPENDS ${PLASMA_FBS_OUTPUT_FILES}) + +if(FLATBUFFERS_VENDORED) + add_dependencies(gen_plasma_fbs flatbuffers_ep) +endif() + add_custom_command( OUTPUT ${PLASMA_FBS_OUTPUT_FILES} # The --gen-object-api flag generates a C++ class MessageT for each @@ -57,10 +63,6 @@ add_custom_command( COMMENT "Running flatc compiler on ${PLASMA_FBS_SRC}" VERBATIM) -add_custom_target(gen_plasma_fbs DEPENDS ${PLASMA_FBS_OUTPUT_FILES}) - -add_dependencies(gen_plasma_fbs flatbuffers_ep) - if(UNIX AND NOT APPLE) link_libraries(rt) endif()