[
https://issues.apache.org/jira/browse/ARROW-2283?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16389709#comment-16389709
]
ASF GitHub Bot commented on ARROW-2283:
---
wesm closed pull request #1721: ARROW-2283: [C++] Support Arrow C++ installed
in /usr detection by pkg-config
URL: https://github.com/apache/arrow/pull/1721
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/cpp/cmake_modules/FindArrow.cmake
b/cpp/cmake_modules/FindArrow.cmake
index 70defd6525..0a1789a8f6 100644
--- a/cpp/cmake_modules/FindArrow.cmake
+++ b/cpp/cmake_modules/FindArrow.cmake
@@ -25,6 +25,7 @@
# ARROW_FOUND, whether arrow has been found
include(FindPkgConfig)
+include(GNUInstallDirs)
if ("$ENV{ARROW_HOME}" STREQUAL "")
pkg_check_modules(ARROW arrow)
@@ -33,6 +34,16 @@ if ("$ENV{ARROW_HOME}" STREQUAL "")
message(STATUS "Arrow ABI version: ${ARROW_ABI_VERSION}")
pkg_get_variable(ARROW_SO_VERSION arrow so_version)
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION}")
+if ("${ARROW_INCLUDE_DIRS}" STREQUAL "")
+ set(ARROW_INCLUDE_DIRS "/usr/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+if ("${ARROW_LIBRARY_DIRS}" STREQUAL "")
+ set(ARROW_LIBRARY_DIRS "/usr/${CMAKE_INSTALL_LIBDIR}")
+ if (EXISTS "/etc/debian_version" AND CMAKE_LIBRARY_ARCHITECTURE)
+set(ARROW_LIBRARY_DIRS
+ "${ARROW_LIBRARY_DIRS}/${CMAKE_LIBRARY_ARCHITECTURE}")
+ endif()
+endif()
set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS})
set(ARROW_LIBS ${ARROW_LIBRARY_DIRS})
set(ARROW_SEARCH_LIB_PATH ${ARROW_LIBRARY_DIRS})
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> [C++] Support Arrow C++ installed in /usr detection by pkg-config
> -
>
> Key: ARROW-2283
> URL: https://issues.apache.org/jira/browse/ARROW-2283
> Project: Apache Arrow
> Issue Type: Improvement
> Components: C++
>Affects Versions: 0.8.0
>Reporter: Kouhei Sutou
>Assignee: Kouhei Sutou
>Priority: Minor
> Labels: pull-request-available
> Fix For: 0.9.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
