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/parquet-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new c0fad61 PARQUET-1349: [C++] PARQUET_RPATH_ORIGIN is not picked by the
build
c0fad61 is described below
commit c0fad614f6782695a3c6678dd0097e1fea442675
Author: Korn, Uwe <[email protected]>
AuthorDate: Sat Jul 14 15:57:35 2018 -0400
PARQUET-1349: [C++] PARQUET_RPATH_ORIGIN is not picked by the build
The previous implementation did not work correctly. Using now the same code
as in Arrow.
Author: Korn, Uwe <[email protected]>
Closes #476 from xhochy/PARQUET-1349 and squashes the following commits:
1acb1b7 [Korn, Uwe] PARQUET-1349: [C++] PARQUET_RPATH_ORIGIN is not picked
by the build
---
CMakeLists.txt | 1 -
cmake_modules/BuildUtils.cmake | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52f63d0..b53f598 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -729,7 +729,6 @@ ADD_LIB(parquet
STATIC_LINK_LIBS ${LIBPARQUET_INTERFACE_LINK_LIBS}
ABI_VERSION ${PARQUET_ABI_VERSION}
SO_VERSION ${PARQUET_SO_VERSION}
- LIB_RPATH_ORIGIN ${PARQUET_RPATH_ORIGIN}
)
############################################################
diff --git a/cmake_modules/BuildUtils.cmake b/cmake_modules/BuildUtils.cmake
index a6341e5..1ce891c 100644
--- a/cmake_modules/BuildUtils.cmake
+++ b/cmake_modules/BuildUtils.cmake
@@ -17,7 +17,7 @@
function(ADD_LIB LIB_NAME)
set(options)
- set(one_value_args SHARED_LINK_FLAGS ABI_VERSION SO_VERSION LIB_BUILD_SHARED
LIB_BUILD_STATIC LIB_RPATH_ORIGIN)
+ set(one_value_args SHARED_LINK_FLAGS ABI_VERSION SO_VERSION LIB_BUILD_SHARED
LIB_BUILD_STATIC)
set(multi_value_args SOURCES STATIC_LINK_LIBS STATIC_PRIVATE_LINK_LIBS
SHARED_LINK_LIBS SHARED_PRIVATE_LINK_LIBS DEPENDENCIES)
cmake_parse_arguments(ARG "${options}" "${one_value_args}"
"${multi_value_args}" ${ARGN})
if(ARG_UNPARSED_ARGUMENTS)
@@ -64,7 +64,7 @@ function(ADD_LIB LIB_NAME)
LINK_PRIVATE ${ARG_SHARED_PRIVATE_LINK_LIBS})
endif()
- if (LIB_RPATH_ORIGIN)
+ if (PARQUET_RPATH_ORIGIN)
if (APPLE)
set(_lib_install_rpath "@loader_path")
else()
