From b448bb331a3a09bc395d38ee8e1261b209872ba6 Mon Sep 17 00:00:00 2001 From: Nicolas Cuervo Date: Sun, 31 Jul 2016 20:35:45 -0700 Subject: cmake: Fix compatibility with new versioning scheme - Fixes init_usrp --- host/cmake/Modules/UHDConfigVersion.cmake.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'host/cmake/Modules/UHDConfigVersion.cmake.in') 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 -- cgit v1.2.3