aboutsummaryrefslogtreecommitdiffstats
path: root/host/cmake/Modules
diff options
context:
space:
mode:
authorNicolas Cuervo <nicolas.cuervo@ettus.com>2016-07-31 20:35:45 -0700
committerMartin Braun <martin.braun@ettus.com>2016-08-01 18:39:54 -0700
commitb448bb331a3a09bc395d38ee8e1261b209872ba6 (patch)
tree799a2006b980a7e9d5ff856f97f753e7162339e1 /host/cmake/Modules
parentdbbda210c2f9a0e28850b5983e40e3c1e19d2b22 (diff)
downloaduhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.tar.gz
uhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.tar.bz2
uhd-b448bb331a3a09bc395d38ee8e1261b209872ba6.zip
cmake: Fix compatibility with new versioning scheme
- Fixes init_usrp
Diffstat (limited to 'host/cmake/Modules')
-rw-r--r--host/cmake/Modules/UHDConfigVersion.cmake.in5
1 files changed, 3 insertions, 2 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