mirror of
https://github.com/apache/arrow.git
synced 2026-10-29 00:56:31 +08:00
Fix rpath issues per ARROW-53
This commit is contained in:
1 parent
75545391c5
commit
cae9b39d15
3 files changed
+6
-5
No files matched your search
+2
-2
@@ -27,7 +27,8 @@ matrix:
|
||||
- $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
|
||||
- $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
|
||||
- compiler: clang
|
||||
language: cpp
|
||||
language: objective-c
|
||||
osx_image: xcode6.4
|
||||
os: osx
|
||||
addons:
|
||||
before_script:
|
||||
@@ -40,7 +41,6 @@ before_install:
|
||||
- ulimit -c unlimited -S
|
||||
- export CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build
|
||||
- export ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install
|
||||
- export LD_LIBRARY_PATH=$ARROW_CPP_INSTALL/lib:$LD_LIBRARY_PATH
|
||||
|
||||
after_script:
|
||||
- rm -rf $CPP_BUILD_DIR
|
||||
|
||||
@@ -420,10 +420,11 @@ set(LINK_LIBS
|
||||
arrow
|
||||
)
|
||||
|
||||
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
|
||||
add_library(pyarrow SHARED
|
||||
${PYARROW_SRCS})
|
||||
target_link_libraries(pyarrow ${LINK_LIBS})
|
||||
set_target_properties(pyarrow PROPERTIES LINKER_LANGUAGE CXX)
|
||||
|
||||
if(APPLE)
|
||||
set_target_properties(pyarrow PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
|
||||
@@ -473,7 +474,7 @@ foreach(module ${CYTHON_EXTENSIONS})
|
||||
endwhile(${i} GREATER 0)
|
||||
|
||||
# for inplace development for now
|
||||
# set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")
|
||||
#set(module_install_rpath "${CMAKE_SOURCE_DIR}/pyarrow/")
|
||||
|
||||
set_target_properties(${module_name} PROPERTIES
|
||||
INSTALL_RPATH ${module_install_rpath})
|
||||
|
||||
+1
-1
@@ -233,8 +233,8 @@ setup(
|
||||
name="pyarrow",
|
||||
packages=['pyarrow', 'pyarrow.tests'],
|
||||
version=VERSION,
|
||||
zip_safe=False,
|
||||
package_data={'pyarrow': ['*.pxd', '*.pyx']},
|
||||
|
||||
# Dummy extension to trigger build_ext
|
||||
ext_modules=[Extension('__dummy__', sources=[])],
|
||||
|
||||
|
||||
Reference in new issue
Block a user