You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/08/01 13:56:56 UTC
[arrow] branch master updated: ARROW-2930: [C++] migrated MacOS
specific code for shared library target
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 0fc224b ARROW-2930: [C++] migrated MacOS specific code for shared library target
0fc224b is described below
commit 0fc224bd746c4936286e7fa031d9b350877a55bb
Author: Philipp Hoch <p....@celonis.com>
AuthorDate: Wed Aug 1 09:56:51 2018 -0400
ARROW-2930: [C++] migrated MacOS specific code for shared library target
Static only build is failing on MacOS as shared library target is not available. Proposed PR sets the INSTALL_RPATH to the shared target accordingly within the "shared configuration" branch.
Author: Philipp Hoch <p....@celonis.com>
Closes #2350 from philhoch/master and squashes the following commits:
89e96a8d <Philipp Hoch> ARROW-2930 migrated MacOS specific code which requires shared library build target to shared part
---
cpp/cmake_modules/BuildUtils.cmake | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
index ca8d285..8255248 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -154,6 +154,18 @@ function(ADD_ARROW_LIB LIB_NAME)
INSTALL_RPATH ${_lib_install_rpath})
endif()
+ if (APPLE)
+ 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 "${_lib_install_name}")
+ endif()
+
install(TARGETS ${LIB_NAME}_shared
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -188,18 +200,6 @@ function(ADD_ARROW_LIB LIB_NAME)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
- if (APPLE)
- 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 "${_lib_install_name}")
- endif()
-
endfunction()