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 <Uwe.Korn@blue-yonder.com> 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
apache · Jul 14, 2018 · c0fad61 · c0fad61
1 parent e6739e9
commit c0fad61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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()