From 431ef567d70d1c9d38bcfff529ca6f6e218068d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 4 Jul 2019 13:48:34 +0200 Subject: [PATCH 1/3] update SO versioning --- cpp/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8f00eb21cb2..8bf0c02b403 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -39,12 +39,14 @@ if(ARROW_VERSION_MAJOR STREQUAL "" endif() # The SO version is also the ABI version -if(arrow_VERSION_MAJOR STREQUAL "0") +if(ARROW_VERSION_MAJOR STREQUAL "0") # Arrow 0.x.y => SO version is "x", full SO version is "x.y.0" set(ARROW_SO_VERSION "${ARROW_VERSION_MINOR}") set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") else() - message(FATAL_ERROR "Need to implement SO version generation for Arrow 1.0+") + # Arrow 1.x.y => SO version is "10x", full SO version is "x.y.0" + MATH(EXPR ARROW_SO_VERSION "${ARROW_VERSION_MAJOR} * 100 + ${ARROW_VERSION_MINOR}") + set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") endif() message(STATUS "Arrow version: " From 74a8cbf2a61ac935da54e8557cc3728e4982df06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 4 Jul 2019 14:48:40 +0200 Subject: [PATCH 2/3] fix full so-version in comment --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8bf0c02b403..0824703e392 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -44,7 +44,7 @@ if(ARROW_VERSION_MAJOR STREQUAL "0") set(ARROW_SO_VERSION "${ARROW_VERSION_MINOR}") set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") else() - # Arrow 1.x.y => SO version is "10x", full SO version is "x.y.0" + # Arrow 1.x.y => SO version is "10x", full SO version is "10x.y.0" MATH(EXPR ARROW_SO_VERSION "${ARROW_VERSION_MAJOR} * 100 + ${ARROW_VERSION_MINOR}") set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") endif() From 81519fe1f83c928d9c886555cf52ad065e2215af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 4 Jul 2019 15:26:08 +0200 Subject: [PATCH 3/3] cmake-format --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 0824703e392..82585d05d3d 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -45,7 +45,7 @@ if(ARROW_VERSION_MAJOR STREQUAL "0") set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") else() # Arrow 1.x.y => SO version is "10x", full SO version is "10x.y.0" - MATH(EXPR ARROW_SO_VERSION "${ARROW_VERSION_MAJOR} * 100 + ${ARROW_VERSION_MINOR}") + math(EXPR ARROW_SO_VERSION "${ARROW_VERSION_MAJOR} * 100 + ${ARROW_VERSION_MINOR}") set(ARROW_FULL_SO_VERSION "${ARROW_SO_VERSION}.${ARROW_VERSION_PATCH}.0") endif()