Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 75EFB200C3B for ; Sat, 18 Mar 2017 18:29:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 747C9160B7F; Sat, 18 Mar 2017 17:29:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9B255160B7A for ; Sat, 18 Mar 2017 18:29:23 +0100 (CET) Received: (qmail 71774 invoked by uid 500); 18 Mar 2017 17:29:22 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 71765 invoked by uid 99); 18 Mar 2017 17:29:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Mar 2017 17:29:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BDBABDFD73; Sat, 18 Mar 2017 17:29:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: uwe@apache.org To: commits@arrow.apache.org Message-Id: <481d839edf2147e2b5198c13771857dc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-648: [C++] Support multiarch on Debian Date: Sat, 18 Mar 2017 17:29:22 +0000 (UTC) archived-at: Sat, 18 Mar 2017 17:29:24 -0000 Repository: arrow Updated Branches: refs/heads/master 16dd87164 -> f5157a0af ARROW-648: [C++] Support multiarch on Debian On multiarch enabled Debian, we need to install libraries into ${CMAKE_INSTALL_PREFIX}/lib/${ARCH}/ instead of ${CMAKE_INSTALL_PREFIX}/lib/. See also: https://wiki.debian.org/Multiarch/HOWTO Author: Kouhei Sutou Closes #398 from kou/debian-support-multiarch and squashes the following commits: f5c8495 [Kouhei Sutou] [C++] Fix missing "${prefix}/" in .pc.in 8da48f6 [Kouhei Sutou] [C++] Support multiarch on Debian Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/f5157a0a Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/f5157a0a Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/f5157a0a Branch: refs/heads/master Commit: f5157a0af7046a618f159a5d0693a664f45658d7 Parents: 16dd871 Author: Kouhei Sutou Authored: Sat Mar 18 18:29:12 2017 +0100 Committer: Uwe L. Korn Committed: Sat Mar 18 18:29:12 2017 +0100 ---------------------------------------------------------------------- cpp/CMakeLists.txt | 1 + cpp/cmake_modules/BuildUtils.cmake | 8 ++++---- cpp/src/arrow/CMakeLists.txt | 4 ++-- cpp/src/arrow/arrow.pc.in | 2 +- cpp/src/arrow/io/CMakeLists.txt | 2 +- cpp/src/arrow/io/arrow-io.pc.in | 2 +- cpp/src/arrow/ipc/CMakeLists.txt | 2 +- cpp/src/arrow/ipc/arrow-ipc.pc.in | 2 +- cpp/src/arrow/jemalloc/CMakeLists.txt | 2 +- cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5ecc34e..b39646e 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -28,6 +28,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") include(CMakeParseArguments) include(ExternalProject) +include(GNUInstallDirs) set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support") set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty") http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/cmake_modules/BuildUtils.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake index 2da8a05..9e14838 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake @@ -68,8 +68,8 @@ function(ADD_ARROW_LIB LIB_NAME) endif() install(TARGETS ${LIB_NAME}_shared - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if (ARROW_BUILD_STATIC) @@ -84,8 +84,8 @@ function(ADD_ARROW_LIB LIB_NAME) LINK_PRIVATE ${ARG_STATIC_PRIVATE_LINK_LIBS}) install(TARGETS ${LIB_NAME}_static - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if (APPLE) http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 0abd4b9..24a9547 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -34,7 +34,7 @@ install(FILES type_fwd.h type_traits.h test-util.h - DESTINATION include/arrow) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow") # pkg-config support configure_file(arrow.pc.in @@ -42,7 +42,7 @@ configure_file(arrow.pc.in @ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow.pc" - DESTINATION "lib/pkgconfig/") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") ####################################### # Unit tests http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/arrow.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/arrow.pc.in b/cpp/src/arrow/arrow.pc.in index 5ad429b..1c3f65d 100644 --- a/cpp/src/arrow/arrow.pc.in +++ b/cpp/src/arrow/arrow.pc.in @@ -16,7 +16,7 @@ # under the License. prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/lib +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: Apache Arrow http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/io/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/io/CMakeLists.txt b/cpp/src/arrow/io/CMakeLists.txt index ceb7b73..69621d3 100644 --- a/cpp/src/arrow/io/CMakeLists.txt +++ b/cpp/src/arrow/io/CMakeLists.txt @@ -123,4 +123,4 @@ configure_file(arrow-io.pc.in @ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow-io.pc" - DESTINATION "lib/pkgconfig/") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/io/arrow-io.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/io/arrow-io.pc.in b/cpp/src/arrow/io/arrow-io.pc.in index 4b4abdd..af28aae 100644 --- a/cpp/src/arrow/io/arrow-io.pc.in +++ b/cpp/src/arrow/io/arrow-io.pc.in @@ -16,7 +16,7 @@ # under the License. prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/lib +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: Apache Arrow I/O http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/ipc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt index 09a959b..4a5e319 100644 --- a/cpp/src/arrow/ipc/CMakeLists.txt +++ b/cpp/src/arrow/ipc/CMakeLists.txt @@ -163,7 +163,7 @@ configure_file(arrow-ipc.pc.in @ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow-ipc.pc" - DESTINATION "lib/pkgconfig/") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") set(UTIL_LINK_LIBS http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/ipc/arrow-ipc.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/ipc/arrow-ipc.pc.in b/cpp/src/arrow/ipc/arrow-ipc.pc.in index 73b44c9..cbc226a 100644 --- a/cpp/src/arrow/ipc/arrow-ipc.pc.in +++ b/cpp/src/arrow/ipc/arrow-ipc.pc.in @@ -16,7 +16,7 @@ # under the License. prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/lib +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: Apache Arrow IPC http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/jemalloc/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/jemalloc/CMakeLists.txt b/cpp/src/arrow/jemalloc/CMakeLists.txt index 5d5482a..c7e6c6a 100644 --- a/cpp/src/arrow/jemalloc/CMakeLists.txt +++ b/cpp/src/arrow/jemalloc/CMakeLists.txt @@ -112,4 +112,4 @@ configure_file(arrow-jemalloc.pc.in @ONLY) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/arrow-jemalloc.pc" - DESTINATION "lib/pkgconfig/") + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") http://git-wip-us.apache.org/repos/asf/arrow/blob/f5157a0a/cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in b/cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in index 0b300fe..18085aa 100644 --- a/cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in +++ b/cpp/src/arrow/jemalloc/arrow-jemalloc.pc.in @@ -16,7 +16,7 @@ # under the License. prefix=@CMAKE_INSTALL_PREFIX@ -libdir=${prefix}/lib +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/include Name: Apache Arrow jemalloc-based allocator