[arrow] branch master updated: ARROW-2723: [C++] Add .pc for arrow orc

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou 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 7c81bd6  ARROW-2723: [C++] Add .pc for arrow orc
7c81bd6 is described below

commit 7c81bd66185ccf4ec6c9a536cf270c17d2fe92aa
Author: yosuke shiro <ys201...@gmail.com>
AuthorDate: Thu Jun 21 14:10:52 2018 +0900

    ARROW-2723: [C++] Add .pc for arrow orc
    
    Author: yosuke shiro <ys201...@gmail.com>
    
    Closes #2148 from shiro615/add-pc-for-arrow-orc and squashes the following 
commits:
    
    71673dd1 [yosuke shiro] [C++] Add .pc for arrow orc
---
 cpp/src/arrow/adapters/orc/CMakeLists.txt                   |  8 ++++++++
 .../arrow/adapters/orc/{CMakeLists.txt => arrow-orc.pc.in}  | 13 ++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt 
b/cpp/src/arrow/adapters/orc/CMakeLists.txt
index eb7194c..0883717 100644
--- a/cpp/src/arrow/adapters/orc/CMakeLists.txt
+++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt
@@ -23,3 +23,11 @@
 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/")
diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt 
b/cpp/src/arrow/adapters/orc/arrow-orc.pc.in
similarity index 78%
copy from cpp/src/arrow/adapters/orc/CMakeLists.txt
copy to cpp/src/arrow/adapters/orc/arrow-orc.pc.in
index eb7194c..eec59cc 100644
--- a/cpp/src/arrow/adapters/orc/CMakeLists.txt
+++ b/cpp/src/arrow/adapters/orc/arrow-orc.pc.in
@@ -15,11 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-#######################################
-# arrow_orc
-#######################################
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
-# Headers: top level
-install(FILES
-        adapter.h
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/adapters/orc")
+Name: Apache Arrow ORC
+Description: ORC modules for Apache Arrow
+Version: @ARROW_VERSION@
+Requires: arrow