diff options
| author |   Nicholas Corgan <n.corgan@gmail.com> | 2020-08-17 20:24:12 -0500 |
|---|---|---|
| committer |   mormj <34754695+mormj@users.noreply.github.com> | 2020-08-24 08:30:07 -0400 |
| commit | 7395911b276c48d71cfb148bdb85764e35456523 (patch) | |
| tree | 8817d6d61c4646661eaebc54b867005388e7485f /gr-network | |
| parent | grc: prevent search keystrokes from modifying flowgraph, take two (diff) | |
| download | gnuradio-7395911b276c48d71cfb148bdb85764e35456523.tar.xz gnuradio-7395911b276c48d71cfb148bdb85764e35456523.zip | |
network: build fixes
* Add missing Windows resource file
* Include in component list in GnuradioConfig.cmake
Diffstat (limited to 'gr-network')
| -rw-r--r-- | gr-network/lib/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | gr-network/lib/gnuradio-network.rc.in | 43 |
2 files changed, 57 insertions, 0 deletions
diff --git a/gr-network/lib/CMakeLists.txt b/gr-network/lib/CMakeLists.txt index 999e39d18..52a267079 100644 --- a/gr-network/lib/CMakeLists.txt +++ b/gr-network/lib/CMakeLists.txt @@ -39,6 +39,20 @@ if (APPLE) ) endif(APPLE) +#Add Windows DLL resource file if using MSVC +if (MSVC) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-network.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-network.rc + @ONLY) + + target_sources(gnuradio-network PRIVATE + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-network.rc + ) +endif (MSVC) + ######################################################################## #Install built library files ######################################################################## diff --git a/gr-network/lib/gnuradio-network.rc.in b/gr-network/lib/gnuradio-network.rc.in new file mode 100644 index 000000000..d631b3ab0 --- /dev/null +++ b/gr-network/lib/gnuradio-network.rc.in @@ -0,0 +1,43 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include <afxres.h> + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@ + PRODUCTVERSION @MAJOR_VERSION@,@API_COMPAT@,@RC_MINOR_VERSION@,@RC_MAINT_VERSION@ + 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", "gnuradio-network" + VALUE "FileVersion", "@VERSION@" + VALUE "InternalName", "gnuradio-network.dll" + VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" + VALUE "OriginalFilename", "gnuradio-network.dll" + VALUE "ProductName", "gnuradio-network" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END |