diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-10-28 17:23:26 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-10-31 09:39:34 -0700 |
commit | c66cb1bad0d881394f3519bd94f4693cceab4c64 (patch) | |
tree | feaa7d26208091a73f12548703363b5cb004211c /host/include | |
parent | f9ef7bda990591962a740aa3ab249aee30451ed9 (diff) | |
download | uhd-c66cb1bad0d881394f3519bd94f4693cceab4c64.tar.gz uhd-c66cb1bad0d881394f3519bd94f4693cceab4c64.tar.bz2 uhd-c66cb1bad0d881394f3519bd94f4693cceab4c64.zip |
cmake: Change version numbering to remove leading zeros
Diffstat (limited to 'host/include')
-rw-r--r-- | host/include/config.h.in | 8 | ||||
-rw-r--r-- | host/include/uhd/version.hpp.in | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/host/include/config.h.in b/host/include/config.h.in index 8931d6580..b1958ae42 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -18,9 +18,9 @@ #cmakedefine HAVE_LOG2 /* Version macros */ -#cmakedefine UHD_VERSION_MAJOR ${TRIMMED_VERSION_MAJOR} -#cmakedefine UHD_VERSION_API ${TRIMMED_VERSION_API} -#cmakedefine UHD_VERSION_ABI ${TRIMMED_VERSION_ABI} -#cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH} +#cmakedefine UHD_VERSION_MAJOR ${UHD_VERSION_MAJOR} +#cmakedefine UHD_VERSION_API ${UHD_VERSION_API} +#cmakedefine UHD_VERSION_ABI ${UHD_VERSION_ABI} +#cmakedefine UHD_VERSION_PATCH ${UHD_VERSION_PATCH} #cmakedefine ENABLE_USB #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index 10f6a97ba..f63d973e9 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -27,7 +27,7 @@ * The format is oldest API compatible release - ABI compat number. * The compatibility number allows pre-release ABI to be versioned. */ -#define UHD_VERSION_ABI_STRING "@TRIMMED_VERSION_MAJOR@.@TRIMMED_VERSION_API@.@TRIMMED_VERSION_ABI@" +#define UHD_VERSION_ABI_STRING "@UHD_VERSION_MAJOR@.@UHD_VERSION_API@.@UHD_VERSION_ABI@" /*! * A macro to check UHD version at compile-time. |