diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-15 18:10:20 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-15 18:10:20 +0100 |
| commit | 3b2976de83609d70aff6d4c90a72773972753b97 (patch) | |
| tree | ef91771368796bfaae04d7d5aea37636474498d8 | |
| parent | 8c73c62b95e12e88a8aa68154cadc024229de6df (diff) | |
| parent | f9d5075724e833401edd8065fc05a5c0edcaef75 (diff) | |
| download | uhd-3b2976de83609d70aff6d4c90a72773972753b97.tar.gz uhd-3b2976de83609d70aff6d4c90a72773972753b97.tar.bz2 uhd-3b2976de83609d70aff6d4c90a72773972753b97.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/cmake/Modules/UHDGlobalDefs.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake index b4c0173ea..4edd03c6b 100644 --- a/host/cmake/Modules/UHDGlobalDefs.cmake +++ b/host/cmake/Modules/UHDGlobalDefs.cmake @@ -23,7 +23,11 @@ INCLUDE(CheckCXXSymbolExists) CHECK_CXX_SYMBOL_EXISTS("log2" "cmath" HAVE_LOG2) ## Macros for the version number -MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + ${TRIMMED_VERSION_PATCH}") +IF(UHD_VERSION_DEVEL) + MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + 99") +ELSE() + MATH(EXPR UHD_VERSION_ADDED "10000 * ${TRIMMED_VERSION_MAJOR} + 100 * ${TRIMMED_VERSION_MINOR} + ${TRIMMED_VERSION_PATCH}") +ENDIF(UHD_VERSION_DEVEL) ADD_DEFINITIONS(-DUHD_VERSION=${UHD_VERSION_ADDED}) ## make sure the code knows about config.h |