diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-14 10:22:10 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-14 16:20:46 -0700 |
| commit | 0b2f56bdd6b0a7dd52f795663f921061af192e6a (patch) | |
| tree | 3983c755b6e40851afbd03c9891422978456a975 /host/cmake/Modules/UHDGlobalDefs.cmake | |
| parent | 8cde538c6df89d9e7b2bdd7b8def9044f638fb60 (diff) | |
| download | uhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.tar.gz uhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.tar.bz2 uhd-0b2f56bdd6b0a7dd52f795663f921061af192e6a.zip | |
Changing UHD's versioning system
* Version numbers now Major.API.ABI.Patch
Diffstat (limited to 'host/cmake/Modules/UHDGlobalDefs.cmake')
| -rw-r--r-- | host/cmake/Modules/UHDGlobalDefs.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake index 58c0b1287..48d0c34cf 100644 --- a/host/cmake/Modules/UHDGlobalDefs.cmake +++ b/host/cmake/Modules/UHDGlobalDefs.cmake @@ -1,5 +1,5 @@ # -# Copyright 2015 Ettus Research LLC +# Copyright 2015,2016 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,9 +24,9 @@ CHECK_CXX_SYMBOL_EXISTS(log2 cmath HAVE_LOG2) ## Macros for the version number IF(UHD_VERSION_DEVEL) - MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + 99") + MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + 99") ELSE() - MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + ${TRIMMED_VERSION_PATCH}") + MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + ${TRIMMED_VERSION_PATCH}") ENDIF(UHD_VERSION_DEVEL) ADD_DEFINITIONS(-DUHD_VERSION=${UHD_VERSION_ADDED}) |