arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1147: [C++] Allow optional vendoring of flatbuffers in plasma
Date Fri, 23 Jun 2017 23:33:06 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 98f7cac6e -> 73007de72


ARROW-1147: [C++] Allow optional vendoring of flatbuffers in plasma

Author: Phillip Cloud <cpcloud@gmail.com>

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 <cpcloud@gmail.com>
Authored: Fri Jun 23 19:33:01 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
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()


Mime
View raw message