[arrow] branch main updated: GH-34395: [Python] Add support for symbolic linked Arrow related include directories (#34674)

[assignuser]

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

assignuser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 7ae236c1fa GH-34395: [Python] Add support for symbolic linked Arrow 
related include directories (#34674)
7ae236c1fa is described below

commit 7ae236c1fa74d4812f2312a5dff2babfc6baeffe
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Thu Mar 23 09:56:40 2023 +0900

    GH-34395: [Python] Add support for symbolic linked Arrow related include 
directories (#34674)
    
    ### Rationale for this change
    
    Homebrew uses symbolic link for `$(brew --prefix)/include/arrow`. The 
current code doesn't work with it because `install(DIRECTORY)` accepts a 
directory not a symbolic link.
    
    ### What changes are included in this PR?
    
    This changes use resolved path instead of symbolic link.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #34395
    
    Authored-by: Sutou Kouhei <k...@clear-code.com>
    Signed-off-by: Jacob Wujciak-Jens <ja...@wujciak.de>
---
 python/CMakeLists.txt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 580857d50c..326e518f73 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -499,8 +499,8 @@ function(bundle_arrow_dependency library_name)
 endfunction()
 
 # Always bundle includes
-get_filename_component(ARROW_INCLUDE_DIR_REAL ${ARROW_INCLUDE_DIR} REALPATH)
-install(DIRECTORY ${ARROW_INCLUDE_DIR_REAL}/arrow DESTINATION 
${CMAKE_INSTALL_INCLUDEDIR})
+get_filename_component(ARROW_INCLUDE_ARROW_DIR_REAL ${ARROW_INCLUDE_DIR}/arrow 
REALPATH)
+install(DIRECTORY ${ARROW_INCLUDE_ARROW_DIR_REAL} DESTINATION 
${CMAKE_INSTALL_INCLUDEDIR})
 
 if(PYARROW_BUNDLE_ARROW_CPP)
   # Arrow
@@ -577,8 +577,9 @@ endif()
 # Parquet
 if(PYARROW_BUILD_PARQUET)
   if(PYARROW_BUNDLE_ARROW_CPP)
-    get_filename_component(PARQUET_INCLUDE_DIR_REAL ${PARQUET_INCLUDE_DIR} 
REALPATH)
-    install(DIRECTORY ${PARQUET_INCLUDE_DIR_REAL}/parquet
+    get_filename_component(PARQUET_INCLUDE_PARQUET_DIR_REAL
+                           ${PARQUET_INCLUDE_DIR}/parquet REALPATH)
+    install(DIRECTORY ${PARQUET_INCLUDE_PARQUET_DIR_REAL}
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   endif()
 
@@ -609,8 +610,9 @@ if(PYARROW_BUILD_PLASMA)
   endif()
   find_package(Plasma REQUIRED)
 
-  get_filename_component(PLASMA_INCLUDE_DIR_REAL ${PLASMA_INCLUDE_DIR} 
REALPATH)
-  install(DIRECTORY ${PLASMA_INCLUDE_DIR_REAL}/plasma
+  get_filename_component(PLASMA_INCLUDE_PLASMA_DIR_REAL 
${PLASMA_INCLUDE_DIR}/plasma
+                         REALPATH)
+  install(DIRECTORY ${PLASMA_INCLUDE_PLASMA_DIR_REAL}
           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
   if(PYARROW_BUNDLE_ARROW_CPP)
@@ -679,8 +681,9 @@ if(PYARROW_BUILD_GANDIVA)
   find_package(Gandiva REQUIRED)
 
   if(PYARROW_BUNDLE_ARROW_CPP)
-    get_filename_component(GANDIVA_INCLUDE_DIR_REAL ${GANDIVA_INCLUDE_DIR} 
REALPATH)
-    install(DIRECTORY ${GANDIVA_INCLUDE_DIR_REAL}/gandiva
+    get_filename_component(GANDIVA_INCLUDE_GANDIVA_DIR_REAL
+                           ${GANDIVA_INCLUDE_DIR}/gandiva REALPATH)
+    install(DIRECTORY ${GANDIVA_INCLUDE_GANDIVA_DIR_REAL}
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
     bundle_arrow_lib(${GANDIVA_SHARED_LIB} SO_VERSION ${ARROW_SO_VERSION})