Repository: arrow Updated Branches: refs/heads/master 5fda24776 -> 1b957dcf1
ARROW-688: [C++] Use CMAKE_INSTALL_INCLUDEDIR for consistency Using CMAKE_INSTALL_INCLUDEDIR isn't required. It's just for consistency. We already used CMAKE_INSTALL_INCLUDEDIR at cpp/src/arrow/CMakeLists.txt. Or we can revert CMAKE_INSTALL_INCLUDEDIR change at cpp/src/arrow/CMakeLists.txt. Author: Kouhei Sutou <[email protected]> Closes #420 from kou/cpp-use-cmake-install-includedir-for-consistency and squashes the following commits: ba7da0d [Kouhei Sutou] [C++] Use CMAKE_INSTALL_INCLUDEDIR for consistency Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/1b957dcf Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/1b957dcf Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/1b957dcf Branch: refs/heads/master Commit: 1b957dcf1a025a45a858091e51138b4a75c3826a Parents: 5fda247 Author: Kouhei Sutou <[email protected]> Authored: Wed Mar 22 11:48:41 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Wed Mar 22 11:48:41 2017 -0400 ---------------------------------------------------------------------- cpp/src/arrow/io/CMakeLists.txt | 2 +- cpp/src/arrow/ipc/CMakeLists.txt | 2 +- cpp/src/arrow/jemalloc/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/1b957dcf/cpp/src/arrow/io/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/io/CMakeLists.txt b/cpp/src/arrow/io/CMakeLists.txt index af3acbf..8aabf64 100644 --- a/cpp/src/arrow/io/CMakeLists.txt +++ b/cpp/src/arrow/io/CMakeLists.txt @@ -109,7 +109,7 @@ install(FILES hdfs.h interfaces.h memory.h - DESTINATION include/arrow/io) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/io") # pkg-config support configure_file(arrow-io.pc.in http://git-wip-us.apache.org/repos/asf/arrow/blob/1b957dcf/cpp/src/arrow/ipc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt index 5d470df..3a98a38 100644 --- a/cpp/src/arrow/ipc/CMakeLists.txt +++ b/cpp/src/arrow/ipc/CMakeLists.txt @@ -144,7 +144,7 @@ install(FILES metadata.h reader.h writer.h - DESTINATION include/arrow/ipc) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/ipc") # pkg-config support configure_file(arrow-ipc.pc.in http://git-wip-us.apache.org/repos/asf/arrow/blob/1b957dcf/cpp/src/arrow/jemalloc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/jemalloc/CMakeLists.txt b/cpp/src/arrow/jemalloc/CMakeLists.txt index c7e6c6a..b8e6e23 100644 --- a/cpp/src/arrow/jemalloc/CMakeLists.txt +++ b/cpp/src/arrow/jemalloc/CMakeLists.txt @@ -104,7 +104,7 @@ ARROW_BENCHMARK_LINK_LIBRARIES(jemalloc-builder-benchmark # Headers: top level install(FILES memory_pool.h - DESTINATION include/arrow/jemalloc) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/jemalloc") # pkg-config support configure_file(arrow-jemalloc.pc.in
