[arrow] branch master updated: ARROW-5026: [Python][Packaging] Fix gandiva.dll detection on non Windows

[ko...@apache.org]

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

kou 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 c0590fc  ARROW-5026: [Python][Packaging] Fix gandiva.dll detection on non Windows
c0590fc is described below

commit c0590fcdefbb1b943166cb8af9dd28dbfed42ff8
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Wed Mar 27 15:26:47 2019 +0900

    ARROW-5026: [Python][Packaging] Fix gandiva.dll detection on non Windows
    
    This is a workaround for 0.13.0 release. We should do real fix after
    0.13.0 release.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #4043 from kou/python-conda-gandiva-non-windows and squashes the following commits:
    
    1ce1fe91 <Kouhei Sutou>  Fix gandiva.dll detection on non Windows
---
 cpp/cmake_modules/FindGandiva.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cpp/cmake_modules/FindGandiva.cmake b/cpp/cmake_modules/FindGandiva.cmake
index 07b0378..da65912 100644
--- a/cpp/cmake_modules/FindGandiva.cmake
+++ b/cpp/cmake_modules/FindGandiva.cmake
@@ -48,8 +48,13 @@ else()
 
   # TODO: ARROW-5021
   set(GANDIVA_SEARCH_LIB_PATH "${GANDIVA_HOME}/lib")
-  # TODO: ARROW-5025
-  set(GANDIVA_SEARCH_SHARED_LIB_PATH "${GANDIVA_HOME}/bin")
+  if(WIN32)
+    # TODO: ARROW-5025
+    set(GANDIVA_SEARCH_SHARED_LIB_PATH "${GANDIVA_HOME}/bin")
+  else()
+    # TODO: ARROW-5026
+    set(GANDIVA_SEARCH_SHARED_LIB_PATH "${GANDIVA_HOME}/lib")
+  endif()
 
   find_path(GANDIVA_INCLUDE_DIR gandiva/expression_registry.h
             PATHS ${GANDIVA_SEARCH_HEADER_PATHS}