From c66cb1bad0d881394f3519bd94f4693cceab4c64 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Fri, 28 Oct 2016 17:23:26 -0700
Subject: cmake: Change version numbering to remove leading zeros

---
 host/lib/CMakeLists.txt | 6 +++---
 host/lib/uhd.rc.in      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 0cd89953c..a4be9fd81 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -140,10 +140,10 @@ ENDIF(ENABLE_C_API)
 # Add DLL resource file to Windows build
 ########################################################################
 IF(MSVC)
-    MATH(EXPR TRIMMED_VERSION_MAJOR_API "${TRIMMED_VERSION_MAJOR} * 1000 + ${TRIMMED_VERSION_API}")
-    SET(RC_TRIMMED_VERSION_PATCH ${TRIMMED_VERSION_PATCH})
+    MATH(EXPR RC_VERSION_MAJOR_API "${UHD_VERSION_MAJOR} * 1000 + ${UHD_VERSION_API}")
+    SET(RC_VERSION_PATCH ${UHD_VERSION_PATCH})
     IF(UHD_VERSION_DEVEL)
-        SET(RC_TRIMMED_VERSION_PATCH "999")
+        SET(RC_VERSION_PATCH "999")
     ENDIF(UHD_VERSION_DEVEL)
 
     # Allow a custom .rc template file to be used
diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in
index 24177a00a..dee6bb8a3 100644
--- a/host/lib/uhd.rc.in
+++ b/host/lib/uhd.rc.in
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @TRIMMED_VERSION_MAJOR_API@,@TRIMMED_VERSION_ABI@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
-  PRODUCTVERSION @TRIMMED_VERSION_MAJOR_API@,@TRIMMED_VERSION_ABI@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@
+  FILEVERSION @RC_VERSION_MAJOR_API@,@UHD_VERSION_ABI@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@
+  PRODUCTVERSION @RC_VERSION_MAJOR_API@,@UHD_VERSION_ABI@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@
   FILEFLAGSMASK 0x3fL
 #ifndef NDEBUG
   FILEFLAGS 0x0L
-- 
cgit v1.2.3