parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-925: Use detected ARROW_LIBS from ARROW_LIB_PATH
Date Sun, 26 Mar 2017 23:33:54 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 4ef7222b3 -> d54e31327


PARQUET-925: Use detected ARROW_LIBS from ARROW_LIB_PATH

Author: Uwe L. Korn <uwe@apache.org>

Closes #274 from xhochy/arrow_python-fixes and squashes the following commits:

f379663 [Uwe L. Korn] Use detected ARROW_LIBS from ARROW_LIB_PATH


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/d54e3132
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/d54e3132
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/d54e3132

Branch: refs/heads/master
Commit: d54e3132724508b23224ddb971406d1f03d786e4
Parents: 4ef7222
Author: Uwe L. Korn <uwe@apache.org>
Authored: Sun Mar 26 19:33:49 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Sun Mar 26 19:33:49 2017 -0400

----------------------------------------------------------------------
 cmake_modules/FindArrow.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/d54e3132/cmake_modules/FindArrow.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/FindArrow.cmake b/cmake_modules/FindArrow.cmake
index 6c67b7f..b98c688 100644
--- a/cmake_modules/FindArrow.cmake
+++ b/cmake_modules/FindArrow.cmake
@@ -56,7 +56,7 @@ if (ARROW_INCLUDE_DIR AND ARROW_LIB_PATH)
   set(ARROW_LIB_NAME libarrow)
   set(ARROW_IO_LIB_NAME libarrow_io)
 
-  set(ARROW_LIBS ${ARROW_SEARCH_LIB_PATH})
+  get_filename_component(ARROW_LIBS ${ARROW_LIB_PATH} DIRECTORY)
   set(ARROW_STATIC_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}.a)
   set(ARROW_SHARED_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
 


Mime
View raw message