Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
19075f9
[ARROW-5450]: [Rust] Basic JSON reader
nevi-me Feb 12, 2019
f921ef8
remove hardcoded length
nevi-me Feb 12, 2019
000d529
ARROW-4537: [CI] Suppress shell warning on travis-ci
mrkn Feb 12, 2019
b31845d
ARROW-4481: [Website] Remove generated specification docs from site a…
wesm Feb 12, 2019
35b2871
ARROW-4535: [C++] Fix MakeBuilder to preserve ListType's field name
mrkn Feb 12, 2019
41e3bff
ARROW-3653: [C++][Python] Support data copying between different GPU …
pearu Feb 12, 2019
a5d8ccc
ARROW-4181: [Python] Fixes for Numpy struct array conversion
pitrou Feb 12, 2019
61b2926
ARROW-4532: [Java] fix bug causing very large varchar value buffers
Feb 12, 2019
579fefb
ARROW-4423: [C++] Upgrade vendored gmock/gtest to 1.8.1
emkornfield Feb 12, 2019
3ceef46
ARROW-4468: [Rust] Implement BitAnd/BitOr for &Buffer (with SIMD) (#3…
paddyhoran Feb 12, 2019
af60c2e
ARROW-3292: [C++] Test Flight RPC in Travis CI
pitrou Feb 12, 2019
75b3166
ARROW-4523,ARROW-4524: [JS] Add row proxy generation benchmark, impro…
TheNeuralBit Feb 13, 2019
5ed6fb5
ARROW-4550: [JS] Fix AMD pattern
mbostock Feb 13, 2019
27ba26c
ARROW-4513: [Rust] Implement BitAnd/BitOr for &Bitmap
paddyhoran Feb 13, 2019
d831e2c
ARROW-47: [C++] Preliminary arrow::Scalar object model
wesm Feb 13, 2019
51b5143
ARROW-4539: [Java] Fix child vector count for lists. (#3625)
praveenbingo Feb 13, 2019
69d595a
ARROW-4558: [C++][Flight] Implement gRPC customizations without UB
wesm Feb 13, 2019
d3825b6
remove `panic!`s
nevi-me Feb 14, 2019
0405bf9
remove panics, coerce scalar + list to list
nevi-me Feb 14, 2019
6d8ef01
fix broken test
nevi-me Feb 14, 2019
2571b03
ARROW-4340: [C++][CI] Build IWYU for LLVM 7 in iwyu docker-compose job
fsaintjacques Feb 14, 2019
49c70cc
ARROW-4204: [Gandiva] add support for decimal subtract
Feb 14, 2019
148213e
ARROW-3162: Flight Python bindings
Feb 14, 2019
b9819e8
ARROW-4563: [Python] Validate decimal128() precision input
pitrou Feb 14, 2019
47ebb1a
ARROW-1896: [C++] Do not allocate memory inside CastKernel. Clean up …
wesm Feb 15, 2019
bf138a8
ARROW-4576: [Python] Fix error during benchmarks
pitrou Feb 15, 2019
40b0c88
ARROW-3669: [Python] Raise error on Numpy byte-swapped array
pitrou Feb 15, 2019
10e8942
ARROW-4529: [C++] Add test for BitUtil::RoundDown
fsaintjacques Feb 15, 2019
09cb71c
ARROW-4474: Use signed integers in FlightInfo payload size fields
lidavidm Feb 15, 2019
bdbf630
ARROW-4582: [Python/C++] Acquire the GIL on Py_INCREF
xhochy Feb 15, 2019
341f1b2
ARROW-4585: [C++] Add protoc dependency to flight_testing
xhochy Feb 15, 2019
524a9dc
ARROW-4577: [C++] Don't set interface link libs on arrow_shared where…
xhochy Feb 15, 2019
e1bc0d4
ARROW-4586: [Rust] Remove arrow/mod.rs as it is not needed
paddyhoran Feb 16, 2019
a374c3c
ARROW-4490: [Rust] Add explicit SIMD vectorization for boolean ops in…
paddyhoran Feb 16, 2019
bbca717
ARROW-4341: [C++] Refactor Primitive builders and BooleanBuilder to u…
bkietz Feb 16, 2019
b74cc65
ARROW-4592: [GLib] Stop configure immediately when GLib isn't available
kou Feb 16, 2019
aa765aa
ARROW-4594: [Ruby] Arrow::StructArray#[] returns Arrow::Struct instea…
kou Feb 16, 2019
0c340b4
ARROW-4593: [Ruby] Arrow::Array#[out_of_range] returns nil
kou Feb 17, 2019
bb78e8b
ARROW-4584: [Python] Add built wheel to manylinux1 dockerignore
xhochy Feb 17, 2019
cfbe0ce
ARROW-4377: [Rust] Implement std::fmt::Debug for PrimitiveArrays
Feb 17, 2019
a7e93a5
ARROW-4598: [CI] Remove needless LLVM_DIR for macOS
kou Feb 17, 2019
3f3da9d
PARQUET-1532: [C++] Fix build error with MinGW
kou Feb 17, 2019
3606aa2
ARROW-4589: [Rust] Projection push down query optimizer rule
andygrove Feb 17, 2019
5e2445b
ARROW-4601: [Python] Add license header to dockerignore
xhochy Feb 17, 2019
811c7dc
ARROW-4464: [Rust] [DataFusion] Add support for LIMIT
Feb 17, 2019
6321a01
revert deleting mod file
nevi-me Feb 18, 2019
7eb7c5d
[ARROW-5450]: [Rust] Basic JSON reader
nevi-me Feb 12, 2019
33fdc6b
remove hardcoded length
nevi-me Feb 12, 2019
b7bdf69
remove `panic!`s
nevi-me Feb 14, 2019
e49b1a6
remove panics, coerce scalar + list to list
nevi-me Feb 14, 2019
c34800b
fix broken test
nevi-me Feb 14, 2019
abd9604
revert deleting mod file
nevi-me Feb 18, 2019
56c92c0
Merge branch 'rust/json-reader' of https://github.com/nevi-me/arrow i…
nevi-me Feb 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ matrix:
env:
- ARROW_TRAVIS_VALGRIND=1
- ARROW_TRAVIS_USE_TOOLCHAIN=1
- ARROW_TRAVIS_FLIGHT=1
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_ORC=1
- ARROW_TRAVIS_PARQUET=1
Expand All @@ -86,10 +87,11 @@ matrix:
os: linux
jdk: openjdk8
env:
- ARROW_TRAVIS_COVERAGE=1
- ARROW_TRAVIS_USE_TOOLCHAIN=1
- ARROW_TRAVIS_FLIGHT=1
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_ORC=1
- ARROW_TRAVIS_COVERAGE=1
- ARROW_TRAVIS_PARQUET=1
- ARROW_TRAVIS_GANDIVA=1
- ARROW_TRAVIS_GANDIVA_JAVA=1
Expand Down Expand Up @@ -181,6 +183,7 @@ matrix:
env:
- ARROW_TRAVIS_USE_TOOLCHAIN=1
- ARROW_TRAVIS_PLASMA=1
- ARROW_TRAVIS_FLIGHT=1
- ARROW_TRAVIS_ORC=1
- ARROW_TRAVIS_PARQUET=1
- ARROW_TRAVIS_GANDIVA=1
Expand Down
4 changes: 1 addition & 3 deletions c_glib/arrow-glib/array-builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,7 @@ garrow_array_builder_append_nulls(GArrowArrayBuilder *builder,

auto arrow_builder =
static_cast<BUILDER>(garrow_array_builder_get_raw(builder));
uint8_t valid_bytes[n];
memset(valid_bytes, 0, sizeof(uint8_t) * n);
auto status = arrow_builder->AppendNulls(valid_bytes, n);
auto status = arrow_builder->AppendNulls(n);
return garrow_error_check(error, status, context);
}

Expand Down
5 changes: 4 additions & 1 deletion c_glib/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ fi
AC_SUBST(GARROW_CFLAGS)
AC_SUBST(GARROW_CXXFLAGS)

AM_PATH_GLIB_2_0([2.32.4], [], [], [gobject gio])
AM_PATH_GLIB_2_0([2.32.4],
[],
[AC_MSG_ERROR(GLib isn't available)],
[gobject gio])

GOBJECT_INTROSPECTION_REQUIRE([1.32.1])
GTK_DOC_CHECK([1.18-2])
Expand Down
4 changes: 2 additions & 2 deletions c_glib/test/helper/buildable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def build_string_array(values)
build_array(Arrow::StringArrayBuilder.new, values)
end

def build_list_array(value_data_type, values_list)
value_field = Arrow::Field.new("value", value_data_type)
def build_list_array(value_data_type, values_list, field_name: "value")
value_field = Arrow::Field.new(field_name, value_data_type)
data_type = Arrow::ListDataType.new(value_field)
builder = Arrow::ListArrayBuilder.new(data_type)
values_list.each do |values|
Expand Down
2 changes: 1 addition & 1 deletion c_glib/test/test-list-array.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class TestListArray < Test::Unit::TestCase
include Helper::Buildable

def test_new
field = Arrow::Field.new("item", Arrow::Int8DataType.new)
field = Arrow::Field.new("value", Arrow::Int8DataType.new)
data_type = Arrow::ListDataType.new(field)
value_offsets = Arrow::Buffer.new([0, 2, 5, 5].pack("l*"))
data = Arrow::Buffer.new([1, 2, 3, 4, 5].pack("c*"))
Expand Down
4 changes: 2 additions & 2 deletions c_glib/test/test-orc-file-reader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def item_data_type
end

def build_items_array(items_array)
build_list_array(item_data_type, items_array)
build_list_array(item_data_type, items_array, field_name: "item")
end

def items_data_type
Expand Down Expand Up @@ -93,7 +93,7 @@ def key_value_data_type
end

def build_key_value_array(key_value_array)
build_list_array(key_value_data_type, key_value_array)
build_list_array(key_value_data_type, key_value_array, field_name: "item")
end

def middle_array
Expand Down
2 changes: 2 additions & 0 deletions ci/conda_env_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
boost-cpp=1.68.0
brotli
bzip2
c-ares
cmake
double-conversion
flatbuffers
gflags
glog
gmock
grpc-cpp
gtest
libprotobuf
lz4-c
Expand Down
39 changes: 39 additions & 0 deletions ci/docker_install_iwyu.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

set -eu

: ${IWYU_REPO:="https://github.com/include-what-you-use/include-what-you-use.git"}
: ${IWYU_BRANCH:="clang_7.0"}
: ${IWYU_SRC:="/tmp/iwyu"}
: ${IWYU_HOME:="/opt/iwyu"}

git clone "${IWYU_REPO}" "${IWYU_SRC}"
git -C "${IWYU_SRC}" checkout ${IWYU_BRANCH}

mkdir -p "${IWYU_HOME}"
pushd "${IWYU_HOME}"

# Build IWYU for current Clang
export CC=clang-7
export CXX=clang++-7

cmake -DCMAKE_PREFIX_PATH=/usr/lib/llvm-7 "${IWYU_SRC}"
make -j4

popd
31 changes: 17 additions & 14 deletions ci/travis_before_script_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,61 +78,65 @@ fi
ARROW_CXXFLAGS=""

# Use Ninja for faster builds when using toolchain
if [ $ARROW_TRAVIS_USE_TOOLCHAIN == "1" ]; then
if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -GNinja"
if [ "$DISTRO_CODENAME" != "trusty" ]; then
# Make sure the toolchain linker (from binutils package) is picked up by clang
ARROW_CXXFLAGS="$ARROW_CXXFLAGS -B$CPP_TOOLCHAIN/bin"
fi
fi

if [ $ARROW_TRAVIS_PLASMA == "1" ]; then
if [ "$ARROW_TRAVIS_FLIGHT" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_FLIGHT=ON"
fi

if [ "$ARROW_TRAVIS_PLASMA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PLASMA=ON"
fi

if [ $ARROW_TRAVIS_PLASMA_JAVA_CLIENT == "1" ]; then
if [ "$ARROW_TRAVIS_PLASMA_JAVA_CLIENT" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PLASMA_JAVA_CLIENT=ON"
fi

if [ $ARROW_TRAVIS_ORC == "1" ]; then
if [ "$ARROW_TRAVIS_ORC" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_ORC=ON"
fi

if [ $ARROW_TRAVIS_PARQUET == "1" ]; then
if [ "$ARROW_TRAVIS_PARQUET" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS \
-DARROW_PARQUET=ON \
-DPARQUET_BUILD_EXAMPLES=ON \
-DPARQUET_BUILD_EXECUTABLES=ON"
fi

if [ $ARROW_TRAVIS_GANDIVA == "1" ]; then
if [ "$ARROW_TRAVIS_GANDIVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA=ON"
if [ $ARROW_TRAVIS_GANDIVA_JAVA == "1" ]; then
if [ "$ARROW_TRAVIS_GANDIVA_JAVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA_JAVA=ON"
fi
fi

if [ $ARROW_TRAVIS_VALGRIND == "1" ]; then
if [ "$ARROW_TRAVIS_VALGRIND" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_TEST_MEMCHECK=ON"
fi

if [ $ARROW_TRAVIS_COVERAGE == "1" ]; then
if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GENERATE_COVERAGE=ON"
fi

if [ $ARROW_TRAVIS_VERBOSE == "1" ]; then
if [ "$ARROW_TRAVIS_VERBOSE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
fi

if [ $ARROW_TRAVIS_VENDORED_BOOST == "1" ]; then
if [ "$ARROW_TRAVIS_VENDORED_BOOST" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_BOOST_VENDORED=ON"
fi

if [ $ARROW_TRAVIS_STATIC_BOOST == "1" ]; then
if [ "$ARROW_TRAVIS_STATIC_BOOST" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_BOOST_USE_SHARED=OFF"
fi

if [ $ARROW_TRAVIS_OPTIONAL_INSTALL == "1" ]; then
if [ "$ARROW_TRAVIS_OPTIONAL_INSTALL" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_OPTIONAL_INSTALL=ON"
fi

Expand All @@ -147,7 +151,6 @@ else
if [ "$using_homebrew" = "yes" ]; then
# build against homebrew's boost if we're using it
export BOOST_ROOT=$(brew --prefix boost)
export LLVM_DIR=$(brew --prefix llvm@6)/lib/cmake/llvm
export THRIFT_HOME=$(brew --prefix thrift)
fi
cmake $CMAKE_COMMON_FLAGS \
Expand Down
4 changes: 2 additions & 2 deletions ci/travis_install_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
CONDA_PACKAGES=""
CONDA_LABEL=""

if [ $ARROW_TRAVIS_GANDIVA == "1" ] && [ $TRAVIS_OS_NAME == "osx" ]; then
if [ "$ARROW_TRAVIS_GANDIVA" == "1" ] && [ $TRAVIS_OS_NAME == "osx" ]; then
CONDA_PACKAGES="$CONDA_PACKAGES llvmdev=$CONDA_LLVM_VERSION"
fi

Expand All @@ -38,7 +38,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
fi
fi

if [ $ARROW_TRAVIS_VALGRIND == "1" ]; then
if [ "$ARROW_TRAVIS_VALGRIND" == "1" ]; then
# Use newer Valgrind
CONDA_PACKAGES="$CONDA_PACKAGES valgrind"
fi
Expand Down
6 changes: 3 additions & 3 deletions ci/travis_script_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ CMAKE_COMMON_FLAGS="-DARROW_EXTRA_ERROR_CONTEXT=ON"

PYTHON_CPP_BUILD_TARGETS="arrow_python-all plasma parquet"

if [ $ARROW_TRAVIS_COVERAGE == "1" ]; then
if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GENERATE_COVERAGE=ON"
fi

if [ $ARROW_TRAVIS_PYTHON_GANDIVA == "1" ]; then
if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA=ON"
PYTHON_CPP_BUILD_TARGETS="$PYTHON_CPP_BUILD_TARGETS gandiva"
fi
Expand Down Expand Up @@ -140,7 +140,7 @@ export PYARROW_BUILD_TYPE=$ARROW_BUILD_TYPE
export PYARROW_WITH_PARQUET=1
export PYARROW_WITH_PLASMA=1
export PYARROW_WITH_ORC=1
if [ $ARROW_TRAVIS_PYTHON_GANDIVA == "1" ]; then
if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
export PYARROW_WITH_GANDIVA=1
fi

Expand Down
1 change: 0 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,6 @@ endif()

list(APPEND ARROW_LINK_LIBS ${ARROW_SYSTEM_LINK_LIBS})
list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_SYSTEM_LINK_LIBS})
list(APPEND ARROW_SHARED_INSTALL_INTERFACE_LIBS ${ARROW_SYSTEM_LINK_LIBS})
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${ARROW_SYSTEM_LINK_LIBS})

#
Expand Down
1 change: 1 addition & 0 deletions cpp/build-support/lint_exclusions.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*codegen*
*_generated*
*windows_compatibility.h
*pyarrow_api.h
Expand Down
2 changes: 2 additions & 0 deletions cpp/build-support/run_cpplint.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ def _check_some_files(completed_processes, filenames):
if problem_files:
msg = "{} had cpplint issues"
print("\n".join(map(msg.format, problem_files)))
if isinstance(stdout, bytes):
stdout = stdout.decode('utf8')
print(stdout, file=sys.stderr)
error = True
except Exception:
Expand Down
8 changes: 1 addition & 7 deletions cpp/cmake_modules/BuildUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,10 @@ function(ADD_ARROW_LIB LIB_NAME)
VERSION "${ARROW_FULL_SO_VERSION}"
SOVERSION "${ARROW_SO_VERSION}")

if (ARG_SHARED_INSTALL_INTERFACE_LIBS)
set(INTERFACE_LIBS ${ARG_SHARED_INSTALL_INTERFACE_LIBS})
else()
set(INTERFACE_LIBS ${ARG_SHARED_LINK_LIBS})
endif()

target_link_libraries(${LIB_NAME}_shared
LINK_PUBLIC
"$<BUILD_INTERFACE:${ARG_SHARED_LINK_LIBS}>"
"$<INSTALL_INTERFACE:${INTERFACE_LIBS}>"
"$<INSTALL_INTERFACE:${ARG_SHARED_INSTALL_INTERFACE_LIBS}>"
LINK_PRIVATE ${ARG_SHARED_PRIVATE_LINK_LIBS})

if (ARROW_RPATH_ORIGIN)
Expand Down
14 changes: 14 additions & 0 deletions cpp/cmake_modules/FindArrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ find_library(ARROW_PYTHON_LIB_PATH NAMES arrow_python
NO_DEFAULT_PATH)
get_filename_component(ARROW_PYTHON_LIBS ${ARROW_PYTHON_LIB_PATH} DIRECTORY)

if (PYARROW_BUILD_FLIGHT)
find_library(ARROW_FLIGHT_LIB_PATH NAMES arrow_flight
PATHS
${ARROW_SEARCH_LIB_PATH}
NO_DEFAULT_PATH)
get_filename_component(ARROW_FLIGHT_LIBS ${ARROW_FLIGHT_LIB_PATH} DIRECTORY)
endif()

if (MSVC)
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")

Expand All @@ -101,19 +109,25 @@ if (ARROW_INCLUDE_DIR AND ARROW_LIBS)
set(ARROW_FOUND TRUE)
set(ARROW_LIB_NAME arrow)
set(ARROW_PYTHON_LIB_NAME arrow_python)
set(ARROW_FLIGHT_LIB_NAME arrow_flight)
if (MSVC)
set(ARROW_STATIC_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
set(ARROW_PYTHON_STATIC_LIB ${ARROW_PYTHON_LIBS}/${ARROW_PYTHON_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
set(ARROW_FLIGHT_STATIC_LIB ${ARROW_FLIGHT_LIBS}/${ARROW_FLIGHT_LIB_NAME}${ARROW_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
set(ARROW_SHARED_LIB ${ARROW_SHARED_LIBS}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_PYTHON_SHARED_LIB ${ARROW_PYTHON_SHARED_LIBS}/${ARROW_PYTHON_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_FLIGHT_SHARED_LIB ${ARROW_FLIGHT_SHARED_LIBS}/${ARROW_FLIGHT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_SHARED_IMP_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}.lib)
set(ARROW_PYTHON_SHARED_IMP_LIB ${ARROW_PYTHON_LIBS}/${ARROW_PYTHON_LIB_NAME}.lib)
set(ARROW_FLIGHT_SHARED_IMP_LIB ${ARROW_FLIGHT_LIBS}/${ARROW_FLIGHT_LIB_NAME}.lib)
else()
set(ARROW_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_LIB_NAME}.a)
set(ARROW_PYTHON_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_PYTHON_LIB_NAME}.a)
set(ARROW_FLIGHT_STATIC_LIB ${ARROW_LIBS}/lib${ARROW_FLIGHT_LIB_NAME}.a)

set(ARROW_SHARED_LIB ${ARROW_LIBS}/lib${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_PYTHON_SHARED_LIB ${ARROW_LIBS}/lib${ARROW_PYTHON_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(ARROW_FLIGHT_SHARED_LIB ${ARROW_LIBS}/lib${ARROW_FLIGHT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
endif()

Expand Down
7 changes: 4 additions & 3 deletions cpp/cmake_modules/Findc-ares.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ if (MSVC)
else ()
set(CARES_LIB_NAME
${CMAKE_SHARED_LIBRARY_PREFIX}cares${CMAKE_SHARED_LIBRARY_SUFFIX})
set(CARES_STATIC_LIB_NAME
${CMAKE_STATIC_LIBRARY_PREFIX}cares${CMAKE_STATIC_LIBRARY_SUFFIX})
set(CARES_STATIC_LIB_NAMES
${CMAKE_STATIC_LIBRARY_PREFIX}cares${CMAKE_STATIC_LIBRARY_SUFFIX}
${CMAKE_STATIC_LIBRARY_PREFIX}cares_static${CMAKE_STATIC_LIBRARY_SUFFIX})
endif ()

# Try the parameterized roots, if they exist
Expand All @@ -56,7 +57,7 @@ if (_cares_roots)
PATHS ${_cares_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "lib")
find_library(CARES_STATIC_LIB
NAMES ${CARES_STATIC_LIB_NAME}
NAMES ${CARES_STATIC_LIB_NAMES}
PATHS ${_cares_roots} NO_DEFAULT_PATH
PATH_SUFFIXES "lib")
else ()
Expand Down
Loading