You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/03/20 02:30:49 UTC
[arrow] branch master updated: ARROW-4568: [C++] Add version macros
to headers
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 4b28138 ARROW-4568: [C++] Add version macros to headers
4b28138 is described below
commit 4b28138316c74838cc27e1d800905abfb6e76d05
Author: Korn, Uwe <Uw...@blue-yonder.com>
AuthorDate: Tue Mar 19 21:30:40 2019 -0500
ARROW-4568: [C++] Add version macros to headers
Author: Korn, Uwe <Uw...@blue-yonder.com>
Closes #3980 from xhochy/ARROW-4568 and squashes the following commits:
b8beddb11 <Korn, Uwe> ARROW-4568: Add version macros to headers
---
cpp/src/arrow/api.h | 1 +
cpp/src/arrow/util/config.h.cmake | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/cpp/src/arrow/api.h b/cpp/src/arrow/api.h
index 72c4493..7c8b10a 100644
--- a/cpp/src/arrow/api.h
+++ b/cpp/src/arrow/api.h
@@ -33,6 +33,7 @@
#include "arrow/table_builder.h" // IYWU pragma: export
#include "arrow/tensor.h" // IYWU pragma: export
#include "arrow/type.h" // IYWU pragma: export
+#include "arrow/util/config.h" // IYWU pragma: export
#include "arrow/visitor.h" // IYWU pragma: export
/// \brief Top-level namespace for Apache Arrow C++ API
diff --git a/cpp/src/arrow/util/config.h.cmake b/cpp/src/arrow/util/config.h.cmake
index 06732a3..0e68a6e 100644
--- a/cpp/src/arrow/util/config.h.cmake
+++ b/cpp/src/arrow/util/config.h.cmake
@@ -15,5 +15,10 @@
// specific language governing permissions and limitations
// under the License.
+#define ARROW_VERSION_MAJOR @ARROW_VERSION_MAJOR@
+#define ARROW_VERSION_MINOR @ARROW_VERSION_MINOR@
+#define ARROW_VERSION_PATCH @ARROW_VERSION_PATCH@
+#define ARROW_VERSION ((ARROW_VERSION_MAJOR * 1000) + ARROW_VERSION_MINOR) * 1000 + ARROW_VERSION_PATCH
+
#cmakedefine DOUBLE_CONVERSION_HAS_CASE_INSENSIBILITY
#cmakedefine GRPCPP_PP_INCLUDE