From b50e7c7fcdead9ec500fe3cf518e0a99463a2d73 Mon Sep 17 00:00:00 2001 From: Steven Koo Date: Fri, 22 Apr 2022 16:13:14 -0500 Subject: cmake: Cache UHD_VERSION in all cases This outputs the variable in the CMakeCache, so that we can scrape the version later for building package Signed-off-by: Steven Koo --- host/cmake/Modules/UHDVersion.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host') diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index f4b9f6004..2261bf357 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -137,9 +137,9 @@ endif() if(DEFINED UHD_VERSION) set(UHD_VERSION "${UHD_VERSION}" CACHE STRING "Set UHD_VERSION to a custom value") elseif(TRIM_UHD_VERSION STREQUAL "True") - set(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}") + set(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_HASH}" CACHE STRING "") else() - set(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}") + set(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_API}.${UHD_VERSION_ABI}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}" CACHE STRING "") endif() if(DEFINED UHD_ABI_VERSION) set(UHD_ABI_VERSION "${UHD_ABI_VERSION}" -- cgit v1.2.3