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-927: Specify shared library version of Apache Arrow C++
Date Wed, 29 Mar 2017 22:18:14 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master 768b36cfd -> 507f35373


PARQUET-927: Specify shared library version of Apache Arrow C++

It reduces readlink() calls.

This requires apache/arrow#451.

Author: Kouhei Sutou <kou@clear-code.com>

Closes #277 from kou/extract-so-version-from-pc and squashes the following commits:

9aff91e [Kouhei Sutou] Specify shared library version of Apache Arrow C++


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

Branch: refs/heads/master
Commit: 507f35373924265755286f5db321b5b24229468e
Parents: 768b36c
Author: Kouhei Sutou <kou@clear-code.com>
Authored: Wed Mar 29 18:18:06 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Mar 29 18:18:06 2017 -0400

----------------------------------------------------------------------
 cmake_modules/ThirdpartyToolchain.cmake | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/507f3537/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 330a3af..b4340d0 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -354,13 +354,26 @@ if (ARROW_FOUND AND ARROW_IO_FOUND)
   set(ARROW_INCLUDE_DIR ${ARROW_INCLUDE_DIRS})
   set(ARROW_LIBS ${ARROW_LIBRARY_DIRS})
 
+  pkg_get_variable(ARROW_ABI_VERSION arrow abi_version)
+  pkg_get_variable(ARROW_IO_ABI_VERSION arrow-io abi_version)
+  if (ARROW_ABI_VERSION STREQUAL "")
+    set(ARROW_SHARED_LIB_SUFFIX "")
+  else()
+    set(ARROW_SHARED_LIB_SUFFIX ".${ARROW_ABI_VERSION}")
+  endif()
+  if (ARROW_IO_ABI_VERSION STREQUAL "")
+    set(ARROW_IO_SHARED_LIB_SUFFIX "")
+  else()
+    set(ARROW_IO_SHARED_LIB_SUFFIX ".${ARROW_ABI_VERSION}")
+  endif()
+
   set(ARROW_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}arrow)
   set(ARROW_IO_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}arrow_io)
 
-  set(ARROW_SHARED_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(ARROW_SHARED_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${ARROW_SHARED_LIB_SUFFIX})
   set(ARROW_STATIC_LIB ${ARROW_LIBS}/${ARROW_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
 
-  set(ARROW_IO_SHARED_LIB ${ARROW_LIBS}/${ARROW_IO_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(ARROW_IO_SHARED_LIB ${ARROW_LIBS}/${ARROW_IO_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${ARROW_IO_SHARED_LIB_SUFFIX})
   set(ARROW_IO_STATIC_LIB ${ARROW_LIBS}/${ARROW_IO_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
   find_package(Arrow)


Mime
View raw message