diff options
| author | Nicolas Cuervo <nicolas.cuervo@ettus.com> | 2016-07-31 20:35:45 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-01 18:39:54 -0700 |
| commit | b448bb331a3a09bc395d38ee8e1261b209872ba6 (patch) | |
| tree | 799a2006b980a7e9d5ff856f97f753e7162339e1 /host | |
| parent | dbbda210c2f9a0e28850b5983e40e3c1e19d2b22 (diff) | |
| download | uhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.tar.gz uhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.tar.bz2 uhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.zip | |
cmake: Fix compatibility with new versioning scheme
- Fixes init_usrp
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDConfigVersion.cmake.in | 5 | ||||
| -rw-r--r-- | host/examples/init_usrp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/include/uhd/version.hpp.in | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in index 67e0e408d..549798324 100644 --- a/host/cmake/Modules/UHDConfigVersion.cmake.in +++ b/host/cmake/Modules/UHDConfigVersion.cmake.in @@ -30,7 +30,8 @@ set(ENV{UHD_CONFIG_VERSION_USED} TRUE) # statically in here to avoid using Python all over again. SET(MAJOR_VERSION @TRIMMED_VERSION_MAJOR@) -SET(MINOR_VERSION @TRIMMED_VERSION_MINOR@) +SET(API_VERSION @TRIMMED_VERSION_API@) +SET(ABI_VERSION @TRIMMED_VERSION_ABI@) SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@) SET(DEVEL_VERSION @UHD_VERSION_DEVEL@) @@ -53,7 +54,7 @@ ENDIF(NOT PACKAGE_FIND_VERSION) # to add a fake patch version that should be higher than anything the user # requests. IF(DEVEL_VERSION) - SET(PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.999") + SET(PACKAGE_VERSION "${MAJOR_VERSION}.${API_VERSION}.${ABI_VERSION}.999") ENDIF(DEVEL_VERSION) # assume incorrect versioning by default diff --git a/host/examples/init_usrp/CMakeLists.txt b/host/examples/init_usrp/CMakeLists.txt index 8705b4a8d..4ce51125f 100644 --- a/host/examples/init_usrp/CMakeLists.txt +++ b/host/examples/init_usrp/CMakeLists.txt @@ -59,7 +59,7 @@ SET(CMAKE_BUILD_TYPE "Release") MESSAGE(STATUS "******************************************************************************") MESSAGE(STATUS "* NOTE: When building your own app, you probably need all kinds of different ") MESSAGE(STATUS "* compiler flags. This is just an example, so it's unlikely these settings ") -MESSAGE(STATUS "* exactly matchh what you require. Make sure to double-check compiler and ") +MESSAGE(STATUS "* exactly match what you require. Make sure to double-check compiler and ") MESSAGE(STATUS "* linker flags to make sure your specific requirements are included. ") MESSAGE(STATUS "******************************************************************************") diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in index bfa0b904a..85c0aac9f 100644 --- a/host/include/uhd/version.hpp.in +++ b/host/include/uhd/version.hpp.in @@ -31,7 +31,7 @@ /*! * A macro to check UHD version at compile-time. - * The value of this macro is MAJOR * 10000 + MINOR * 100 + PATCH + * The value of this macro is MAJOR * 1000000 + API * 10000 + ABI * 100 + PATCH * (e.g., for UHD 3.8.1 this is 30801). */ #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@ |