diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2012-02-28 13:24:46 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-28 13:31:31 -0800 |
| commit | aa422ece8206ad40dcc27aa31fcaeb6edd8f3e20 (patch) | |
| tree | 2d67ad9f5daf5e9be46906a080813d7b16e9942a | |
| parent | dfaf1f930ce0ff7219c0d10fc0156cba0e46950a (diff) | |
| download | uhd-aa422ece8206ad40dcc27aa31fcaeb6edd8f3e20.tar.gz uhd-aa422ece8206ad40dcc27aa31fcaeb6edd8f3e20.tar.bz2 uhd-aa422ece8206ad40dcc27aa31fcaeb6edd8f3e20.zip | |
Changes images CMakeLists.txt to be consistent with new UHD version naming system
| -rw-r--r-- | images/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index eed95ace6..42e59931a 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -30,18 +30,17 @@ EXECUTE_PROCESS(COMMAND "date" OUTPUT_VARIABLE DATETIME_NOW OUTPUT_STRIP_TRAILIN SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - Universal Hardware Driver Images") SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC") 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}-${UHD_BUILD_INFO}") +SET(CPACK_PACKAGE_VERSION ${UHD_VERSION}) +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}") +MESSAGE(STATUS "Version: ${UHD_VERSION}") ######################################################################## # Install Images ######################################################################## + #tag the images with a version number (something identifiable) -FILE(WRITE ${CMAKE_SOURCE_DIR}/images/${CPACK_PACKAGE_VERSION}.tag "${CPACK_PACKAGE_VERSION}-${UHD_BUILD_INFO}\n${DATETIME_NOW}\n") +FILE(WRITE ${CMAKE_SOURCE_DIR}/images/${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}.tag "${UHD_VERSION}\n${DATETIME_NOW}\n") INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/images DESTINATION share/uhd) INSTALL(FILES ${CMAKE_SOURCE_DIR}/../host/LICENSE.txt DESTINATION share/uhd/images) |