diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-12-11 16:05:10 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-28 22:21:19 +0100 |
| commit | 659d2e2c78d21ca79099c0ee0b7f5cffefbe04de (patch) | |
| tree | 03c29936f8fbcfb60aeb62cd93bcea6925bee3f0 /host/lib | |
| parent | c0bb43a8a84599f4638df13b461659f79d980cc1 (diff) | |
| download | uhd-659d2e2c78d21ca79099c0ee0b7f5cffefbe04de.tar.gz uhd-659d2e2c78d21ca79099c0ee0b7f5cffefbe04de.tar.bz2 uhd-659d2e2c78d21ca79099c0ee0b7f5cffefbe04de.zip | |
cmake: Dev branches can get a named version
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/uhd.rc.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 5755a6c4c..321278db5 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -99,6 +99,10 @@ LIBUHD_APPEND_SOURCES( # Add DLL resource file to Windows build ######################################################################## IF(MSVC) + SET(RC_TRIMMED_VERSION_PATCH TRIMMED_VERSION_PATCH) + IF(UHD_VERSION_DEVEL) + SET(RC_TRIMMED_VERSION_PATCH "999") + ENDIF(UHD_VERSION_DEVEL) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/uhd.rc.in ${CMAKE_CURRENT_BINARY_DIR}/uhd.rc diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in index feb006bd3..a0eb27b8c 100644 --- a/host/lib/uhd.rc.in +++ b/host/lib/uhd.rc.in @@ -1,8 +1,8 @@ #include <afxres.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ - PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ + FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ + PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ FILEFLAGSMASK 0x3fL #ifndef NDEBUG FILEFLAGS 0x0L |