diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
| commit | 5bbcbaa397d596025c2a1d9db40c683b191a751b (patch) | |
| tree | b9cf2b93d13b5a41404fff803373df6f34877541 /host/cmake/Modules/UHDVersion.cmake | |
| parent | b92662d5780f3a2d872e5ab96efc0760cce1fe53 (diff) | |
| parent | d3bdb8f1602fda76e0a5a2578cb06902abfe7209 (diff) | |
| download | uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.gz uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.bz2 uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.zip | |
Merge branch 'maint'
Conflicts:
fpga-src
Diffstat (limited to 'host/cmake/Modules/UHDVersion.cmake')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 69f668d3f..0fb8c0af3 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -24,10 +24,12 @@ FIND_PACKAGE(Git QUIET) # - increment major on api compatibility changes # - increment minor on feature-level changes # - increment patch on for bug fixes and docs +# - set UHD_VERSION_DEVEL to true for master and development branches ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 008) -SET(UHD_VERSION_PATCH 001) +SET(UHD_VERSION_PATCH 002) +SET(UHD_VERSION_DEVEL FALSE) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages @@ -36,7 +38,7 @@ SET(UHD_VERSION_PATCH 001) FUNCTION(DEPAD_NUM input_num output_num) EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${PYTHON_EXECUTABLE} -c "print int('${input_num}')" + COMMAND ${PYTHON_EXECUTABLE} -c "print int('${input_num}') if isinstance('${input_num}', (int, long)) else '${input_num}'" OUTPUT_VARIABLE depadded_num OUTPUT_STRIP_TRAILING_WHITESPACE ) SET(${output_num} ${depadded_num} PARENT_SCOPE) |