diff options
author | Nicholas Corgan <nick.corgan@ettus.com> | 2014-04-21 14:37:25 -0700 |
---|---|---|
committer | Nicholas Corgan <nick.corgan@ettus.com> | 2014-04-21 14:37:25 -0700 |
commit | b0267efa30e1d460f9831094a955355aca3b812e (patch) | |
tree | aef3797030be7020586e9c79e5a6e7828c23054a /host/cmake/Modules | |
parent | 6bd9fed25f702bf6b2a244c6c045e3945ad165a5 (diff) | |
parent | 743aca4c3e68257253960d37422082aab4fe5d91 (diff) | |
download | uhd-b0267efa30e1d460f9831094a955355aca3b812e.tar.gz uhd-b0267efa30e1d460f9831094a955355aca3b812e.tar.bz2 uhd-b0267efa30e1d460f9831094a955355aca3b812e.zip |
Merge branch 'maint'
Diffstat (limited to 'host/cmake/Modules')
-rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 2 | ||||
-rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index a98a52fc7..8422c24d6 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -99,7 +99,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ettus Research - USRP Hardware Driver") SET(CPACK_PACKAGE_VENDOR "Ettus Research LLC") SET(CPACK_PACKAGE_CONTACT "Ettus Research <support@ettus.com>") SET(CPACK_PACKAGE_VERSION "${UHD_VERSION}") -SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/../README.md) +SET(CPACK_RESOURCE_FILE_WELCOME ${CMAKE_SOURCE_DIR}/README.md) SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) ######################################################################## diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 41c3ac20b..0fc12d257 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 007) -SET(UHD_VERSION_PATCH 000) +SET(UHD_VERSION_PATCH 001) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages |