You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2017/03/07 00:40:35 UTC
parquet-cpp git commit: PARQUET-903: Add option to set RPATH to origin
Repository: parquet-cpp
Updated Branches:
refs/heads/master 0343418c3 -> fe8f98d0e
PARQUET-903: Add option to set RPATH to origin
Dependency of ARROW-566
Author: Uwe L. Korn <uw...@apache.org>
Closes #265 from xhochy/PARQUET-903 and squashes the following commits:
3519c33 [Uwe L. Korn] PARQUET-903: Add option to set RPATH to origin
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/fe8f98d0
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/fe8f98d0
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/fe8f98d0
Branch: refs/heads/master
Commit: fe8f98d0ec7f0bffec0c88c4f6a93c5a9aab6d31
Parents: 0343418
Author: Uwe L. Korn <uw...@apache.org>
Authored: Mon Mar 6 19:40:28 2017 -0500
Committer: Wes McKinney <we...@twosigma.com>
Committed: Mon Mar 6 19:40:28 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 13 ++++++++++++-
src/parquet/arrow/CMakeLists.txt | 10 +++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/fe8f98d0/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9a03e5..6dc7866 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,9 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
option(PARQUET_ZLIB_VENDORED
"Build our own zlib (some libz.a aren't configured for static linking)"
ON)
+ option(PARQUET_RPATH_ORIGIN
+ "Build Parquet libraries with RATH set to \$ORIGIN"
+ OFF)
endif()
if (PARQUET_BUILD_TESTS OR PARQUET_BUILD_EXECUTABLES OR PARQUET_BUILD_BENCHMARKS)
@@ -602,7 +605,15 @@ if (PARQUET_BUILD_SHARED)
OUTPUT_NAME "parquet")
target_link_libraries(parquet_shared
LINK_PRIVATE ${LIBPARQUET_INTERFACE_LINK_LIBS})
- if (APPLE)
+ if (PARQUET_RPATH_ORIGIN)
+ if (APPLE)
+ set(_lib_install_rpath "@loader_path")
+ else()
+ set(_lib_install_rpath "\$ORIGIN")
+ endif()
+ set_target_properties(parquet_shared PROPERTIES
+ INSTALL_RPATH ${_lib_install_rpath})
+ elseif (APPLE)
set_target_properties(parquet_shared
PROPERTIES
BUILD_WITH_INSTALL_RPATH ON
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/fe8f98d0/src/parquet/arrow/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/CMakeLists.txt b/src/parquet/arrow/CMakeLists.txt
index 95741d1..d1d1178 100644
--- a/src/parquet/arrow/CMakeLists.txt
+++ b/src/parquet/arrow/CMakeLists.txt
@@ -47,7 +47,15 @@ if (PARQUET_BUILD_SHARED)
arrow
arrow_io
parquet_shared)
- if (APPLE)
+ if (PARQUET_RPATH_ORIGIN)
+ if (APPLE)
+ set(_lib_install_rpath "@loader_path")
+ else()
+ set(_lib_install_rpath "\$ORIGIN")
+ endif()
+ set_target_properties(parquet_arrow_shared PROPERTIES
+ INSTALL_RPATH ${_lib_install_rpath})
+ elseif (APPLE)
set_target_properties(parquet_arrow_shared
PROPERTIES
BUILD_WITH_INSTALL_RPATH ON