Skip to content

Commit

Permalink
ARROW-5622: [C++][Dataset] Support pkg-config for Arrow Datasets
Browse files Browse the repository at this point in the history
Author: Yosuke Shiro <[email protected]>

Closes #4606 from shiro615/pkg-config-arrow-dataset and squashes the following commits:

202b1f7 <Yosuke Shiro> Use arrow_add_pkg_config()
e7a4057 <Yosuke Shiro>  Support pkg-config for Arrow Datasets
  • Loading branch information
shiro615 authored and kou committed Jun 20, 2019
1 parent 333d9fd commit 961927a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 6 deletions.
4 changes: 1 addition & 3 deletions cpp/src/arrow/adapters/orc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
install(FILES adapter.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/adapters/orc")

# pkg-config support
configure_file(arrow-orc.pc.in "${CMAKE_CURRENT_BINARY_DIR}/arrow-orc.pc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow-orc.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
arrow_add_pkg_config("arrow-orc")

set(ORC_MIN_TEST_LIBS GTest::Main GTest::GTest)

Expand Down
3 changes: 3 additions & 0 deletions cpp/src/arrow/dataset/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ add_custom_target(arrow_dataset)
# Headers: top level
arrow_install_all_headers("arrow/dataset")

# pkg-config support
arrow_add_pkg_config("arrow-dataset")

set(ARROW_DATASET_SRCS scanner.cc)

add_arrow_lib(arrow_dataset
Expand Down
24 changes: 24 additions & 0 deletions cpp/src/arrow/dataset/arrow-dataset.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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.

libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@

Name: Apache Arrow Datasets
Description: Apache Arrow Datasets provides an API to read and write semantic datasets stored in different locations and formats.
Version: @ARROW_VERSION@
Requires: arrow
4 changes: 1 addition & 3 deletions cpp/src/arrow/flight/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ add_custom_target(arrow_flight)
arrow_install_all_headers("arrow/flight")

# pkg-config support
configure_file(arrow-flight.pc.in "${CMAKE_CURRENT_BINARY_DIR}/arrow-flight.pc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow-flight.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
arrow_add_pkg_config("arrow-flight")

set(ARROW_FLIGHT_STATIC_LINK_LIBS
protobuf::libprotobuf
Expand Down

0 comments on commit 961927a

Please sign in to comment.