From cb184a546bbe5a5bf64d9e326863dee7fe37a6be Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Mon, 29 Mar 2021 11:08:29 -0700 Subject: [PATCH 1/2] Expose IMATH_LIB_VERSION_STRING, for easier diagnostics Expose the IMATH_LIB_VERSION as a cpp define, along with IMATH_VERSION, to aid in confirming what SOCURRENT.SOAGE.SOVERSION the library is built with. Signed-off-by: Cary Phillips --- config/ImathConfig.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/ImathConfig.h.in b/config/ImathConfig.h.in index 544a5095..cd936085 100644 --- a/config/ImathConfig.h.in +++ b/config/ImathConfig.h.in @@ -42,6 +42,8 @@ #define IMATH_VERSION_MINOR @IMATH_VERSION_MINOR@ #define IMATH_VERSION_PATCH @IMATH_VERSION_PATCH@ +#define IMATH_LIB_VERSION_STRING "@IMATH_LIB_VERSION@" + #define IMATH_VERSION_HEX ((uint32_t(IMATH_VERSION_MAJOR) << 24) | \ (uint32_t(IMATH_VERSION_MINOR) << 16) | \ (uint32_t(IMATH_VERSION_PATCH) << 8)) From 2bbee370bca0651f8f593890c8b3e770cebe3c68 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Mon, 29 Mar 2021 11:40:29 -0700 Subject: [PATCH 2/2] Add comment explaining IMATH_LIB_VERSION Signed-off-by: Cary Phillips --- config/ImathConfig.h.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/ImathConfig.h.in b/config/ImathConfig.h.in index cd936085..df2d42a6 100644 --- a/config/ImathConfig.h.in +++ b/config/ImathConfig.h.in @@ -42,12 +42,13 @@ #define IMATH_VERSION_MINOR @IMATH_VERSION_MINOR@ #define IMATH_VERSION_PATCH @IMATH_VERSION_PATCH@ -#define IMATH_LIB_VERSION_STRING "@IMATH_LIB_VERSION@" - #define IMATH_VERSION_HEX ((uint32_t(IMATH_VERSION_MAJOR) << 24) | \ (uint32_t(IMATH_VERSION_MINOR) << 16) | \ (uint32_t(IMATH_VERSION_PATCH) << 8)) +// IMATH_LIB_VERSION is the library API version: SOCURRENT.SOAGE.SOREVISION +#define IMATH_LIB_VERSION_STRING "@IMATH_LIB_VERSION@" + // // By default, opt into the interoparability constructors and assignments.