From 1f0a8561f0ccda4dee47dd364d30bef4ac966721 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 13 Jul 2018 11:08:19 -0700 Subject: cmake: Fix version numbering UHD-* branches were being detected as "development", and #cmakedefine does not like it when values are actually zero. --- host/cmake/Modules/UHDVersion.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'host/cmake') diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 23b970084..1f64339cb 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -43,8 +43,8 @@ IF(GIT_FOUND) ) IF(_git_branch_result EQUAL 0) SET(UHD_GIT_BRANCH ${_git_branch}) - IF(UHD_GIT_BRANCH STREQUAL "maint") - MESSAGE(STATUS "Operating on maint branch (stable).") + IF(UHD_GIT_BRANCH MATCHES "^UHD-") + MESSAGE(STATUS "Operating on release branch (${UHD_GIT_BRANCH}).") SET(UHD_VERSION_DEVEL FALSE) ELSEIF(UHD_GIT_BRANCH STREQUAL "master") MESSAGE(STATUS "Operating on master branch.") -- cgit v1.2.3