From 55b4ca73b44735523e5ab3348735a64cbf19cf30 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 22 Mar 2011 10:37:33 -0700
Subject: uhd: setup UHD_VERSION and CPACK_PACKAGE_FILE_NAME

---
 host/Modules/UHDPackage.cmake | 8 ++++++++
 host/Modules/UHDVersion.cmake | 1 +
 images/CMakeLists.txt         | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/host/Modules/UHDPackage.cmake b/host/Modules/UHDPackage.cmake
index ed705148a..6e0af31ba 100644
--- a/host/Modules/UHDPackage.cmake
+++ b/host/Modules/UHDPackage.cmake
@@ -18,6 +18,14 @@
 ########################################################################
 INCLUDE(UHDVersion) #sets version information
 
+########################################################################
+# Setup package file name
+########################################################################
+SET(CPACK_PACKAGE_FILE_NAME "UHD-${UHD_VERSION}")
+IF(DEFINED UHD_PACKAGE_SUFFIX) #append optional suffix (usually system type)
+    SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${UHD_PACKAGE_SUFFIX})
+ENDIF(DEFINED UHD_PACKAGE_SUFFIX)
+
 ########################################################################
 # Setup CPack General
 ########################################################################
diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake
index b0b2ae475..0061dffbc 100644
--- a/host/Modules/UHDVersion.cmake
+++ b/host/Modules/UHDVersion.cmake
@@ -24,6 +24,7 @@ INCLUDE(UHDPython) #requires python for parsing
 SET(UHD_VERSION_MAJOR 003)  #API compatibility number
 SET(UHD_VERSION_MINOR 0)    #Timestamp of git commit
 SET(UHD_VERSION_PATCH 0)    #Short hash of git commit
+SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}")
 
 ########################################################################
 # Find GIT to get repo information
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
index baac333ea..f93b28ca4 100644
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(CPACK_PACKAGE_CONTACT             "support@ettus.com")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${UHD_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${UHD_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${UHD_VERSION_PATCH})
-SET(CPACK_PACKAGE_FILE_NAME "UHD-images-${UHD_VERSION_MAJOR}-${UHD_VERSION_MINOR}-${UHD_VERSION_PATCH}")
+SET(CPACK_PACKAGE_FILE_NAME "UHD-images-${UHD_VERSION}")
 SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all")
 INCLUDE(CPack) #include after setting vars
 MESSAGE(STATUS "Version: ${CPACK_PACKAGE_VERSION}")
-- 
cgit v1.2.3