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/04/01 18:56:44 UTC
parquet-cpp git commit: PARQUET-937: Support CMake < 3.4 again for
Arrow detection
Repository: parquet-cpp
Updated Branches:
refs/heads/master 323ffe656 -> 8a101c5e0
PARQUET-937: Support CMake < 3.4 again for Arrow detection
pkg_get_variable was introduced in CMake 3.4.
See also: https://cmake.org/cmake/help/latest/release/3.4.html
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #283 from kou/support-cmake-3.3-or-older and squashes the following commits:
66462f0 [Kouhei Sutou] Support CMake < 3.4 again for Arrow detection
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/8a101c5e
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/8a101c5e
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/8a101c5e
Branch: refs/heads/master
Commit: 8a101c5e0c730d1b732a18620e909be654927734
Parents: 323ffe6
Author: Kouhei Sutou <ko...@clear-code.com>
Authored: Sat Apr 1 14:56:38 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sat Apr 1 14:56:38 2017 -0400
----------------------------------------------------------------------
cmake_modules/ThirdpartyToolchain.cmake | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/8a101c5e/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 3344075..09f2f2e 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -359,8 +359,13 @@ 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 (COMMAND pkg_get_variable)
+ pkg_get_variable(ARROW_ABI_VERSION arrow abi_version)
+ pkg_get_variable(ARROW_IO_ABI_VERSION arrow-io abi_version)
+ else()
+ set(ARROW_ABI_VERSION "")
+ set(ARROW_IO_ABI_VERSION "")
+ endif()
if (ARROW_ABI_VERSION STREQUAL "")
set(ARROW_SHARED_LIB_SUFFIX "")
else()