Skip to content

ARROW-1537: [C++] Support building with full path install_name on macOS #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kou wants to merge 1 commit into from
Closed

ARROW-1537: [C++] Support building with full path install_name on macOS #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ci/travis_before_script_c_glib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ pushd $ARROW_C_GLIB_DIR
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib

if [ $TRAVIS_OS_NAME == "osx" ]; then
install_name_tool \
-id $ARROW_CPP_INSTALL/lib/libarrow.dylib \
$ARROW_CPP_INSTALL/lib/libarrow.dylib
fi

CONFIGURE_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"
if [ $TRAVIS_OS_NAME != "osx" ]; then
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-gtk-doc"
Expand Down
3 changes: 2 additions & 1 deletion ci/travis_before_script_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ if [ $only_library_mode == "yes" ]; then
CMAKE_COMMON_FLAGS="\
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_TESTS=OFF \
-DARROW_BUILD_UTILITIES=OFF"
-DARROW_BUILD_UTILITIES=OFF \
-DARROW_INSTALL_NAME_RPATH=OFF"
fi

# Use Ninja for faster builds when using toolchain
Expand Down
4 changes: 4 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
"Build Arrow libraries with RATH set to \$ORIGIN"
OFF)

option(ARROW_INSTALL_NAME_RPATH
"Build Arrow libraries with install_name set to @rpath"
ON)

option(ARROW_PLASMA
"Build the plasma object store along with Arrow"
OFF)
Expand Down
9 changes: 7 additions & 2 deletions cpp/cmake_modules/BuildUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,15 @@ function(ADD_ARROW_LIB LIB_NAME)
endif()

if (APPLE)
set_target_properties(${LIB_NAME}_shared
if (ARROW_INSTALL_NAME_RPATH)
set(_lib_install_name "@rpath")
else()
set(_lib_install_name "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
endif()
set_target_properties(${LIB_NAME}_shared
PROPERTIES
BUILD_WITH_INSTALL_RPATH ON
INSTALL_NAME_DIR "@rpath")
INSTALL_NAME_DIR "${_lib_install_name}")
endif()

endfunction()