diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-02-28 16:00:08 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-02-28 16:00:08 -0800 |
| commit | 58da716bf740704769b38bc97b976dc9635aab4f (patch) | |
| tree | 520fdd63c9b33eec3322242e3d7dc961286828b6 /host/lib | |
| parent | 7868ba1cc40bc174addd0a9dec6c715f13a3d99b (diff) | |
| parent | 4a320f31432f8f7c50456a20c4de0ca9b0dde017 (diff) | |
| download | uhd-58da716bf740704769b38bc97b976dc9635aab4f.tar.gz uhd-58da716bf740704769b38bc97b976dc9635aab4f.tar.bz2 uhd-58da716bf740704769b38bc97b976dc9635aab4f.zip | |
Merge branch 'maint34' into maint
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | host/lib/uhd.rc.in | 33 |
2 files changed, 45 insertions, 0 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt index 7a76ebd53..d8ff66a96 100644 --- a/host/lib/CMakeLists.txt +++ b/host/lib/CMakeLists.txt @@ -94,6 +94,18 @@ LIBUHD_APPEND_SOURCES( ) ######################################################################## +# Add DLL resource file to Windows build +######################################################################## +IF(MSVC) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/uhd.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/uhd.rc + @ONLY) + + LIST(APPEND libuhd_sources ${CMAKE_CURRENT_BINARY_DIR}/uhd.rc) +ENDIF(MSVC) + +######################################################################## # Setup libuhd library ######################################################################## ADD_LIBRARY(uhd SHARED ${libuhd_sources}) diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in new file mode 100644 index 000000000..01a5e07f5 --- /dev/null +++ b/host/lib/uhd.rc.in @@ -0,0 +1,33 @@ +#include <afxres.h> + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @RC_VERSION_MAJOR@,@RC_VERSION_MINOR@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@ + PRODUCTVERSION @RC_VERSION_MAJOR@,@RC_VERSION_MINOR@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@ + FILEFLAGSMASK 0x3fL +#ifndef NDEBUG + FILEFLAGS 0x0L +#else + FILEFLAGS 0x1L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_DRV_INSTALLABLE + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "USRP Hardware Driver (UHD) Library" + VALUE "FileVersion", "@UHD_VERSION@" + VALUE "InternalName", "uhd.dll" + VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" + VALUE "OriginalFilename", "uhd.dll" + VALUE "ProductName", "USRP Hardware Driver (UHD) Library" + VALUE "ProductVersion", "@UHD_VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END |