[arrow] branch master updated: ARROW-4969: [C++] Set RPATH in correct order for test executables on OSX

[wesm]

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

wesm 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 bd00f80  ARROW-4969: [C++] Set RPATH in correct order for test 
executables on OSX
bd00f80 is described below

commit bd00f80abf6192fdf25159f0868063029290ef24
Author: Krisztián Szűcs <szucs.kriszt...@gmail.com>
AuthorDate: Wed Mar 20 07:41:30 2019 -0500

    ARROW-4969: [C++] Set RPATH in correct order for test executables on OSX
    
    Running `otool -l debug/arrow-scalar-test`:
    
    Before:
    ```
    Load command 17
              cmd LC_RPATH
          cmdsize 56
             path /Users/krisz/.conda/envs/arrow36/lib (offset 12)
    Load command 18
              cmd LC_RPATH
          cmdsize 64
             path /Users/krisz/Workspace/arrow/cpp/build/debug/ (offset 12)
    ```
    
    After:
    ```
    Load command 17
              cmd LC_RPATH
          cmdsize 64
             path /Users/krisz/Workspace/arrow/cpp/build/debug/ (offset 12)
    Load command 18
              cmd LC_RPATH
          cmdsize 56
             path /Users/krisz/.conda/envs/arrow36/lib (offset 12)
    ```
    
    Author: Krisztián Szűcs <szucs.kriszt...@gmail.com>
    
    Closes #3986 from kszucs/ARROW-4969 and squashes the following commits:
    
    83032da37 <Krisztián Szűcs> swap the rpath order
---
 cpp/cmake_modules/BuildUtils.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/cmake_modules/BuildUtils.cmake 
b/cpp/cmake_modules/BuildUtils.cmake
index 55b4065..0f014ba 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -515,7 +515,7 @@ function(ADD_TEST_CASE REL_TEST_NAME)
                                      INSTALL_RPATH_USE_LINK_PATH
                                      TRUE
                                      INSTALL_RPATH
-                                     
"$ENV{CONDA_PREFIX}/lib;${EXECUTABLE_OUTPUT_PATH}")
+                                     
"${EXECUTABLE_OUTPUT_PATH};$ENV{CONDA_PREFIX}/lib")
   endif()
 
   if(ARG_STATIC_LINK_LIBS)