cmake: Change version numbering to remove leading zeros

8 files changed, 25 insertions, 48 deletions

diff --git a/host/cmake/Modules/UHDConfigVersion.cmake.in b/host/cmake/Modules/UHDConfigVersion.cmake.in
index 549798324..c792b5bf8 100644
--- a/host/cmake/Modules/UHDConfigVersion.cmake.in
+++ b/host/cmake/Modules/UHDConfigVersion.cmake.in
@@ -29,13 +29,13 @@ set(ENV{UHD_CONFIG_VERSION_USED} TRUE)
 # version values as set in cmake/Modules/UHDVersion.cmake, placed
 # statically in here to avoid using Python all over again.
 
-SET(MAJOR_VERSION @TRIMMED_VERSION_MAJOR@)
-SET(API_VERSION @TRIMMED_VERSION_API@)
-SET(ABI_VERSION @TRIMMED_VERSION_ABI@)
-SET(PATCH_VERSION @TRIMMED_VERSION_PATCH@)
+SET(MAJOR_VERSION @UHD_VERSION_MAJOR@)
+SET(API_VERSION @UHD_VERSION_API@)
+SET(ABI_VERSION @UHD_VERSION_ABI@)
+SET(PATCH_VERSION @UHD_VERSION_PATCH@)
 SET(DEVEL_VERSION @UHD_VERSION_DEVEL@)
 
-SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@)
+SET(PACKAGE_VERSION @UHD_VERSION@)
 SET(ENV{UHD_PACKAGE_VERSION} ${PACKAGE_VERSION})
 
 # There is a bug in CMake whereby calling "find_package(FOO)" within
@@ -175,4 +175,4 @@ IF(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
 ENDIF()
 
 # Undo our patch-version-number hack
-SET(PACKAGE_VERSION @TRIMMED_UHD_VERSION@)
+SET(PACKAGE_VERSION @UHD_VERSION@)
diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake
index 167861402..f237126a6 100644
--- a/host/cmake/Modules/UHDGlobalDefs.cmake
+++ b/host/cmake/Modules/UHDGlobalDefs.cmake
@@ -24,9 +24,9 @@ CHECK_CXX_SYMBOL_EXISTS(log2 cmath HAVE_LOG2)
 
 ## Macros for the version number
 IF(UHD_VERSION_DEVEL)
-    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + 99")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${UHD_VERSION_MAJOR} + 10000 * ${UHD_VERSION_API} + 100 * ${UHD_VERSION_ABI} + 99")
 ELSE()
-    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${TRIMMED_VERSION_MAJOR} + 10000 * ${TRIMMED_VERSION_API} + 100 * ${TRIMMED_VERSION_ABI} + ${TRIMMED_VERSION_PATCH}")
+    MATH(EXPR UHD_VERSION_ADDED "1000000 * ${UHD_VERSION_MAJOR} + 10000 * ${UHD_VERSION_API} + 100 * ${UHD_VERSION_ABI} + ${UHD_VERSION_PATCH}")
 ENDIF(UHD_VERSION_DEVEL)
 ADD_DEFINITIONS(-DUHD_VERSION=${UHD_VERSION_ADDED})
 
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake
index 8f0457a6b..d2dd65212 100644
--- a/host/cmake/Modules/UHDPackage.cmake
+++ b/host/cmake/Modules/UHDPackage.cmake
@@ -55,13 +55,12 @@ ENDIF()
 ########################################################################
 # Setup package file name
 ########################################################################
-
 IF(DEBIAN AND LIBUHD_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "libuhd${UHD_VERSION_MAJOR}_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+    SET(CPACK_PACKAGE_FILE_NAME "libuhd${UHD_VERSION_MAJOR}_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
 ELSEIF(DEBIAN AND LIBUHDDEV_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "libuhd-dev_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+    SET(CPACK_PACKAGE_FILE_NAME "libuhd-dev_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
 ELSEIF(DEBIAN AND UHDHOST_PKG)
-    SET(CPACK_PACKAGE_FILE_NAME "uhd-host_${TRIMMED_UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+    SET(CPACK_PACKAGE_FILE_NAME "uhd-host_${UHD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
 ELSE()
     IF(DEBIAN OR REDHAT)
         FIND_PROGRAM(LSB_RELEASE_EXECUTABLE lsb_release)
@@ -124,7 +123,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
 # Setup CPack Source
 ########################################################################
 
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "uhd-${TRIMMED_UHD_VERSION}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "uhd-${UHD_VERSION}")
 SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git*;\\\\.swp$")
 
 ########################################################################
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index e81c891f4..0e8064ff3 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -27,9 +27,9 @@ FIND_PACKAGE(Git QUIET)
 #  - Increment patch for bugfixes and docs
 #  - set UHD_VERSION_DEVEL to true for master and development branches
 ########################################################################
-SET(UHD_VERSION_MAJOR 003)
-SET(UHD_VERSION_API   011)
-SET(UHD_VERSION_ABI   000)
+SET(UHD_VERSION_MAJOR   3)
+SET(UHD_VERSION_API    11)
+SET(UHD_VERSION_ABI     0)
 SET(UHD_VERSION_PATCH git)
 SET(UHD_VERSION_DEVEL TRUE)
 
@@ -74,28 +74,6 @@ IF(GIT_FOUND)
 ENDIF(GIT_FOUND)
 
 ########################################################################
-# Set up trimmed version numbers for DLL resource files and packages
-########################################################################
-FUNCTION(DEPAD_NUM input_num output_num)
-    EXECUTE_PROCESS(
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMAND ${PYTHON_EXECUTABLE} -c "print(int('${input_num}'))"
-        OUTPUT_VARIABLE depadded_num OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    SET(${output_num} ${depadded_num} PARENT_SCOPE)
-ENDFUNCTION(DEPAD_NUM)
-
-DEPAD_NUM(${UHD_VERSION_MAJOR} TRIMMED_VERSION_MAJOR)
-DEPAD_NUM(${UHD_VERSION_API}   TRIMMED_VERSION_API)
-DEPAD_NUM(${UHD_VERSION_ABI}   TRIMMED_VERSION_ABI)
-IF(UHD_VERSION_DEVEL)
-    SET(TRIMMED_VERSION_PATCH ${UHD_VERSION_PATCH})
-ELSE(UHD_VERSION_DEVEL)
-    DEPAD_NUM(${UHD_VERSION_PATCH} TRIMMED_VERSION_PATCH)
-ENDIF(UHD_VERSION_DEVEL)
-SET(TRIMMED_UHD_VERSION "${TRIMMED_VERSION_MAJOR}.${TRIMMED_VERSION_API}.${TRIMMED_VERSION_ABI}.${TRIMMED_VERSION_PATCH}")
-
-########################################################################
 # Version information discovery through git log
 ########################################################################
 
diff --git a/host/include/config.h.in b/host/include/config.h.in
index 8931d6580..b1958ae42 100644
--- a/host/include/config.h.in
+++ b/host/include/config.h.in
@@ -18,9 +18,9 @@
 #cmakedefine HAVE_LOG2
 
 /* Version macros */
-#cmakedefine UHD_VERSION_MAJOR ${TRIMMED_VERSION_MAJOR}
-#cmakedefine UHD_VERSION_API   ${TRIMMED_VERSION_API}
-#cmakedefine UHD_VERSION_ABI   ${TRIMMED_VERSION_ABI}
-#cmakedefine UHD_VERSION_PATCH ${TRIMMED_VERSION_PATCH}
+#cmakedefine UHD_VERSION_MAJOR ${UHD_VERSION_MAJOR}
+#cmakedefine UHD_VERSION_API   ${UHD_VERSION_API}
+#cmakedefine UHD_VERSION_ABI   ${UHD_VERSION_ABI}
+#cmakedefine UHD_VERSION_PATCH ${UHD_VERSION_PATCH}
 #cmakedefine ENABLE_USB
 #cmakedefine UHD_VERSION @UHD_VERSION_ADDED@
diff --git a/host/include/uhd/version.hpp.in b/host/include/uhd/version.hpp.in
index 10f6a97ba..f63d973e9 100644
--- a/host/include/uhd/version.hpp.in
+++ b/host/include/uhd/version.hpp.in
@@ -27,7 +27,7 @@
  * The format is oldest API compatible release - ABI compat number.
  * The compatibility number allows pre-release ABI to be versioned.
  */
-#define UHD_VERSION_ABI_STRING "@TRIMMED_VERSION_MAJOR@.@TRIMMED_VERSION_API@.@TRIMMED_VERSION_ABI@"
+#define UHD_VERSION_ABI_STRING "@UHD_VERSION_MAJOR@.@UHD_VERSION_API@.@UHD_VERSION_ABI@"
 
 /*!
  * A macro to check UHD version at compile-time.
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