You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2019/03/13 12:46:19 UTC
[arrow] branch master updated: ARROW-4811: [C++] Fix misbehaving
CMake dependency on flight_grpc_gen
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new e7713aa ARROW-4811: [C++] Fix misbehaving CMake dependency on flight_grpc_gen
e7713aa is described below
commit e7713aa67c5d8aab07e5a123258699bbb00d2e6a
Author: Wes McKinney <we...@apache.org>
AuthorDate: Wed Mar 13 13:46:10 2019 +0100
ARROW-4811: [C++] Fix misbehaving CMake dependency on flight_grpc_gen
Calling `ninja` from CMake 3.13 was retriggering 5 steps. Adding `flight_grpc_gen` to the DEPENDENCIES of `arrow_python_*` fixes this
Author: Wes McKinney <we...@apache.org>
Closes #3883 from wesm/ARROW-4811 and squashes the following commits:
b11a54f8 <Wes McKinney> Fix misbehaving ninja dependency on flight_grpc_gen
---
cpp/src/arrow/python/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/cpp/src/arrow/python/CMakeLists.txt b/cpp/src/arrow/python/CMakeLists.txt
index 79e0e30..e1b0d7d 100644
--- a/cpp/src/arrow/python/CMakeLists.txt
+++ b/cpp/src/arrow/python/CMakeLists.txt
@@ -44,9 +44,11 @@ set(ARROW_PYTHON_SRCS
pyarrow.cc
serialize.cc)
+set(ARROW_PYTHON_DEPENDENCIES arrow_dependencies)
+
if(ARROW_FLIGHT)
+ set(ARROW_PYTHON_DEPENDENCIES ${ARROW_PYTHON_DEPENDENCIES} flight_grpc_gen)
set(ARROW_PYTHON_SRCS ${ARROW_PYTHON_SRCS} flight.cc)
- set_source_files_properties(flight.cc PROPERTIES OBJECT_DEPENDS flight_grpc_gen)
endif()
if("${COMPILER_FAMILY}" STREQUAL "clang")
@@ -76,7 +78,7 @@ add_arrow_lib(arrow_python
OUTPUTS
ARROW_PYTHON_LIBRARIES
DEPENDENCIES
- arrow_dependencies
+ ${ARROW_PYTHON_DEPENDENCIES}
SHARED_LINK_FLAGS
""
SHARED_LINK_LIBS