[arrow] branch master updated: ARROW-3734: [C++] Linking static zstd library fails on Arch x86-64

[uw...@apache.org]

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

uwe 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 6af5ce9  ARROW-3734: [C++] Linking static zstd library fails on Arch x86-64
6af5ce9 is described below

commit 6af5ce96673b077c494e3cfa1c5d084bec265f34
Author: Dimitri Vorona <vo...@in.tum.de>
AuthorDate: Fri Nov 9 13:07:40 2018 +0100

    ARROW-3734: [C++] Linking static zstd library fails on Arch x86-64
    
    Author: Dimitri Vorona <vo...@in.tum.de>
    
    Closes #2926 from alendit/fix-zstd-compilation and squashes the following commits:
    
    8d570da5 <Dimitri Vorona> Fix zstd linking path
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index c874281..d323092 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1065,12 +1065,12 @@ if (ARROW_WITH_ZSTD)
         "-DZSTD_MULTITHREAD_SUPPORT=off")
 
     if (MSVC)
-      set(ZSTD_STATIC_LIB "${ZSTD_PREFIX}/lib/zstd_static.lib")
+      set(ZSTD_STATIC_LIB "${ZSTD_PREFIX}/${CMAKE_INSTALL_LIBDIR}/zstd_static.lib")
       if (ARROW_USE_STATIC_CRT)
         set(ZSTD_CMAKE_ARGS ${ZSTD_CMAKE_ARGS} "-DZSTD_USE_STATIC_RUNTIME=on")
       endif()
     else()
-      set(ZSTD_STATIC_LIB "${ZSTD_PREFIX}/lib/libzstd.a")
+      set(ZSTD_STATIC_LIB "${ZSTD_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libzstd.a")
       # Only pass our C flags on Unix as on MSVC it leads to a
       # "incompatible command-line options" error
       set(ZSTD_CMAKE_ARGS ${ZSTD_CMAKE_ARGS}