[arrow] branch master updated: ARROW-3125: [C++] Add support for finding libpython on MSYS2

[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 3f36f62  ARROW-3125: [C++] Add support for finding libpython on MSYS2
3f36f62 is described below

commit 3f36f62d29e78980157d5352a5eed1114e9e844f
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Sep 11 12:17:07 2018 +0900

    ARROW-3125: [C++] Add support for finding libpython on MSYS2
    
    libpython on MSYS2 uses "${PYTHON_PREFIX}/lib/libpython3.6m.dll.a"
    format.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #2540 from kou/cpp-support-finding-libpython-on-msys2 and squashes the following commits:
    
    8e648850 <Kouhei Sutou>  Add support for finding libpython on MSYS2
---
 cpp/cmake_modules/FindPythonLibsNew.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpp/cmake_modules/FindPythonLibsNew.cmake b/cpp/cmake_modules/FindPythonLibsNew.cmake
index e45cd01..b9e14c1 100644
--- a/cpp/cmake_modules/FindPythonLibsNew.cmake
+++ b/cpp/cmake_modules/FindPythonLibsNew.cmake
@@ -149,7 +149,10 @@ if(CMAKE_HOST_WIN32)
     set(PYTHON_LIBRARY
       "${PYTHON_PREFIX}/libs/Python${PYTHON_LIBRARY_SUFFIX}.lib")
   else()
-    set(PYTHON_LIBRARY "${PYTHON_PREFIX}/libs/libpython${PYTHON_LIBRARY_SUFFIX}.a")
+    find_library(PYTHON_LIBRARY
+        NAMES "python${PYTHON_LIBRARY_SUFFIX}"
+        PATHS "${PYTHON_PREFIX}" NO_DEFAULT_PATH
+        PATH_SUFFIXES "lib" "libs")
   endif()
 elseif(APPLE)