diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-28 13:54:45 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-18 18:15:36 -0800 |
| commit | bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3 (patch) | |
| tree | 886c21b3e4e5a9e9e0f40e6189045fcd0b44fbe0 /host | |
| parent | ee4bb488684ddd913edfcb4cc09a50d94bf8a1f0 (diff) | |
| download | uhd-bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3.tar.gz uhd-bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3.tar.bz2 uhd-bafc0a045cbea2bb2e5aee9c4f95855bb6fde8d3.zip | |
cmake: Remove duplicate definitions of UHD_VERSION
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDGlobalDefs.cmake | 1 | ||||
| -rw-r--r-- | host/include/config.h.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake index 167861402..70d1a654b 100644 --- a/host/cmake/Modules/UHDGlobalDefs.cmake +++ b/host/cmake/Modules/UHDGlobalDefs.cmake @@ -28,7 +28,6 @@ IF(UHD_VERSION_DEVEL) ELSE() 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}) ## RFNoC IF(ENABLE_RFNOC) diff --git a/host/include/config.h.in b/host/include/config.h.in index 8931d6580..8e72a1f00 100644 --- a/host/include/config.h.in +++ b/host/include/config.h.in @@ -23,4 +23,6 @@ #cmakedefine UHD_VERSION_ABI ${TRIMMED_VERSION_ABI} #cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH} #cmakedefine ENABLE_USB +#ifndef UHD_VERSION #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ +#endif |