Reformat cmake

This commit is contained in:
Wes McKinney authored and David Li committed 2019-02-13 10:49:22 -05:00
1 parent c6b02aa94f
commit 7764444775
2 files changed
+43 -71

No files matched your search

+22 -32
View File
@@ -28,53 +28,43 @@ add_custom_target(arrow_python-tests)
add_dependencies(arrow_python-all arrow_python arrow_python-tests)
set(ARROW_PYTHON_SRCS
arrow_to_pandas.cc
benchmark.cc
common.cc
config.cc
decimal.cc
deserialize.cc
helpers.cc
inference.cc
init.cc
io.cc
numpy_convert.cc
numpy_to_arrow.cc
python_to_arrow.cc
pyarrow.cc
serialize.cc
)
arrow_to_pandas.cc
benchmark.cc
common.cc
config.cc
decimal.cc
deserialize.cc
helpers.cc
inference.cc
init.cc
io.cc
numpy_convert.cc
numpy_to_arrow.cc
python_to_arrow.cc
pyarrow.cc
serialize.cc)
if (ARROW_FLIGHT)
if(ARROW_FLIGHT)
set(ARROW_PYTHON_SRCS ${ARROW_PYTHON_SRCS} flight.cc)
endif()
if ("${COMPILER_FAMILY}" STREQUAL "clang")
set_property(SOURCE pyarrow.cc
APPEND_STRING
PROPERTY COMPILE_FLAGS
" -Wno-cast-qual ")
if("${COMPILER_FAMILY}" STREQUAL "clang")
set_property(SOURCE pyarrow.cc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-cast-qual ")
endif()
set(ARROW_PYTHON_SHARED_LINK_LIBS arrow_shared ${PYTHON_OTHER_LIBS})
if (ARROW_FLIGHT)
if(ARROW_FLIGHT)
# Must link shared: we don't want to link more than one copy of gRPC
# into the eventual Cython shared object, otherwise gRPC calls fail
# with weird errors due to multiple copies of global static state
# (The other solution is to link gRPC shared everywhere instead of
# statically only in Flight)
set(ARROW_PYTHON_SHARED_LINK_LIBS
${ARROW_PYTHON_SHARED_LINK_LIBS}
arrow_flight_shared
)
set(ARROW_PYTHON_SHARED_LINK_LIBS ${ARROW_PYTHON_SHARED_LINK_LIBS} arrow_flight_shared)
endif()
if (WIN32)
set(ARROW_PYTHON_SHARED_LINK_LIBS
${ARROW_PYTHON_SHARED_LINK_LIBS}
${PYTHON_LIBRARIES}
)
if(WIN32)
set(ARROW_PYTHON_SHARED_LINK_LIBS ${ARROW_PYTHON_SHARED_LINK_LIBS} ${PYTHON_LIBRARIES})
endif()
set(ARROW_PYTHON_INCLUDES ${NUMPY_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+21 -39
View File
@@ -58,21 +58,11 @@ endif()
# Top level cmake dir
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
option(PYARROW_BUILD_CUDA
"Build the PyArrow CUDA support"
OFF)
option(PYARROW_BUILD_FLIGHT
"Build the PyArrow Flight integration"
OFF)
option(PYARROW_BUILD_GANDIVA
"Build the PyArrow Gandiva integration"
OFF)
option(PYARROW_BUILD_PARQUET
"Build the PyArrow Parquet integration"
OFF)
option(PYARROW_PARQUET_USE_SHARED
"Rely on parquet shared libraries where relevant"
ON)
option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
option(PYARROW_BUILD_FLIGHT "Build the PyArrow Flight integration" OFF)
option(PYARROW_BUILD_GANDIVA "Build the PyArrow Gandiva integration" OFF)
option(PYARROW_BUILD_PARQUET "Build the PyArrow Parquet integration" OFF)
option(PYARROW_PARQUET_USE_SHARED "Rely on parquet shared libraries where relevant" ON)
option(PYARROW_BOOST_USE_SHARED
"Rely on boost shared libraries on linking static parquet" ON)
option(PYARROW_BUILD_PLASMA "Build the PyArrow Plasma integration" OFF)
@@ -206,7 +196,7 @@ if(PYARROW_BUILD_FLIGHT)
set(ARROW_FLIGHT TRUE)
endif()
## Arrow
# Arrow
find_package(Arrow REQUIRED)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR})
@@ -364,23 +354,17 @@ if(PYARROW_BUNDLE_ARROW_CPP)
endif()
endif()
if (MSVC)
ADD_THIRDPARTY_LIB(arrow
SHARED_LIB ${ARROW_SHARED_IMP_LIB})
ADD_THIRDPARTY_LIB(arrow_python
SHARED_LIB ${ARROW_PYTHON_SHARED_IMP_LIB})
if (PYARROW_BUILD_FLIGHT)
ADD_THIRDPARTY_LIB(arrow_flight
SHARED_LIB ${ARROW_FLIGHT_SHARED_IMP_LIB})
if(MSVC)
ADD_THIRDPARTY_LIB(arrow SHARED_LIB ${ARROW_SHARED_IMP_LIB})
ADD_THIRDPARTY_LIB(arrow_python SHARED_LIB ${ARROW_PYTHON_SHARED_IMP_LIB})
if(PYARROW_BUILD_FLIGHT)
ADD_THIRDPARTY_LIB(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_IMP_LIB})
endif()
else()
ADD_THIRDPARTY_LIB(arrow
SHARED_LIB ${ARROW_SHARED_LIB})
ADD_THIRDPARTY_LIB(arrow_python
SHARED_LIB ${ARROW_PYTHON_SHARED_LIB})
if (PYARROW_BUILD_FLIGHT)
ADD_THIRDPARTY_LIB(arrow_flight
SHARED_LIB ${ARROW_FLIGHT_SHARED_LIB})
ADD_THIRDPARTY_LIB(arrow SHARED_LIB ${ARROW_SHARED_LIB})
ADD_THIRDPARTY_LIB(arrow_python SHARED_LIB ${ARROW_PYTHON_SHARED_LIB})
if(PYARROW_BUILD_FLIGHT)
ADD_THIRDPARTY_LIB(arrow_flight SHARED_LIB ${ARROW_FLIGHT_SHARED_LIB})
endif()
endif()
@@ -501,9 +485,9 @@ if(PYARROW_BUILD_ORC)
set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _orc)
endif()
## Flight
if (PYARROW_BUILD_FLIGHT)
if (PYARROW_BUNDLE_ARROW_CPP)
# Flight
if(PYARROW_BUILD_FLIGHT)
if(PYARROW_BUNDLE_ARROW_CPP)
# TODO:
message(FATAL_ERROR "Not yet implemented: bundling arrow-flight in pyarrow")
endif()
@@ -511,14 +495,12 @@ if (PYARROW_BUILD_FLIGHT)
# here. Linking more than one copy leads to odd runtime errors due
# to multiple copies of static global state. Thus we also need to
# link Flight as a shared object.
set(LINK_LIBS ${LINK_LIBS}
arrow_flight_shared
)
set(LINK_LIBS ${LINK_LIBS} arrow_flight_shared)
set(CYTHON_EXTENSIONS ${CYTHON_EXTENSIONS} _flight)
endif()
## Gandiva
if (PYARROW_BUILD_GANDIVA)
# Gandiva
if(PYARROW_BUILD_GANDIVA)
find_package(Gandiva)
if(NOT GANDIVA_FOUND)