Repository: arrow Updated Branches: refs/heads/master 2c10d7cce -> 7e93075cd
ARROW-405: Use vendored hdfs.h if not found in include/ in $HADOOP_HOME Not all Hadoop distributions have their files arranged in the same way. Author: Wes McKinney <[email protected]> Closes #237 from wesm/ARROW-405 and squashes the following commits: 3a266d3 [Wes McKinney] Use vendored hdfs.h if not found in include/ in $HADOOP_HOME Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/7e93075c Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/7e93075c Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/7e93075c Branch: refs/heads/master Commit: 7e93075cd48c5f6b1b75f9adc43ba53c831046e7 Parents: 2c10d7c Author: Wes McKinney <[email protected]> Authored: Tue Dec 13 06:50:25 2016 +0100 Committer: Uwe L. Korn <[email protected]> Committed: Tue Dec 13 06:50:25 2016 +0100 ---------------------------------------------------------------------- cpp/src/arrow/io/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/7e93075c/cpp/src/arrow/io/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/io/CMakeLists.txt b/cpp/src/arrow/io/CMakeLists.txt index a1892a9..f285180 100644 --- a/cpp/src/arrow/io/CMakeLists.txt +++ b/cpp/src/arrow/io/CMakeLists.txt @@ -56,6 +56,10 @@ if(ARROW_HDFS) if (DEFINED ENV{HADOOP_HOME}) set(HADOOP_HOME $ENV{HADOOP_HOME}) + if (NOT EXISTS "${HADOOP_HOME}/include/hdfs.h") + message(STATUS "Did not find hdfs.h in expected location, using vendored one") + set(HADOOP_HOME "${THIRDPARTY_DIR}/hadoop") + endif() else() set(HADOOP_HOME "${THIRDPARTY_DIR}/hadoop") endif()
