diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 21:21:39 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 21:21:39 -0500 |
| commit | 60dfd1fda2a48dcd111fac115d0d5c70afb210d2 (patch) | |
| tree | ad78b3a090373ce90ebe361479ba7e0f20589f27 | |
| parent | 83c74035b506c1bbc447ab1abd754915b1f44cb8 (diff) | |
| parent | 498604cc5b335f8ad9eac798e45b4b8d5d847506 (diff) | |
Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into next
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 | ||||
| -rw-r--r-- | gr-channels/lib/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | gr-channels/lib/gnuradio-channels.rc.in | 55 | ||||
| -rw-r--r-- | gr-fec/lib/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | gr-fec/lib/gnuradio-fec.rc.in | 55 |
5 files changed, 147 insertions, 3 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 9199a702bb..bafd0a7326 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -54,6 +54,8 @@ if("${MINOR_VERSION}" STREQUAL "git") set(VERSION "${GIT_DESCRIBE}") set(DOCVER "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}") set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}${MINOR_VERSION}") + set(RC_MINOR_VERSION "0") + set(RC_MAINT_VERSION "0") elseif("${MAINT_VERSION}" STREQUAL "git") # VERSION: 3.3.1git-xxx-gxxxxxxxx # DOCVER: 3.3.1git @@ -61,6 +63,8 @@ elseif("${MAINT_VERSION}" STREQUAL "git") set(VERSION "${GIT_DESCRIBE}") set(DOCVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}") set(LIBVER "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}${MAINT_VERSION}") + math(EXPR RC_MINOR_VERSION "${MINOR_VERSION} - 1") + set(RC_MAINT_VERSION "0") else() # This is a numbered release. # VERSION: 3.3.1{.x} @@ -73,4 +77,6 @@ else() endif() set(DOCVER "${VERSION}") set(LIBVER "${VERSION}") + set(RC_MINOR_VERSION ${MINOR_VERSION}) + set(RC_MAINT_VERSION ${MAINT_VERSION}) endif() diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index fe28d41672..b9ed2a4587 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012-2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -47,6 +47,20 @@ list(APPEND channels_sources fading_model_impl.cc ) +#Add Windows DLL resource file if using MSVC +if(MSVC) + include(${CMAKE_INSTALL_PREFIX}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-channels.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-channels.rc + @ONLY) + + list(APPEND channels_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-channels.rc + ) +endif(MSVC) + list(APPEND channels_libs volk gnuradio-core diff --git a/gr-channels/lib/gnuradio-channels.rc.in b/gr-channels/lib/gnuradio-channels.rc.in new file mode 100644 index 0000000000..a1ea9b8d3c --- /dev/null +++ b/gr-channels/lib/gnuradio-channels.rc.in @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#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-channels" + VALUE "FileVersion", "@VERSION@" + VALUE "InternalName", "gnuradio-channels.dll" + VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" + VALUE "OriginalFilename", "gnuradio-channels.dll" + VALUE "ProductName", "gnuradio-channels" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index b0cc130204..f012c8d2e8 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012-2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -44,6 +44,20 @@ list(APPEND gnuradio_fec_sources encode_ccsds_27_bb_impl.cc ) +#Add Windows DLL resource file if using MSVC +if(MSVC) + include(${CMAKE_INSTALL_PREFIX}/cmake/Modules/GrVersion.cmake) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-fec.rc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fec.rc + @ONLY) + + list(APPEND gnuradio_fec_sources + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fec.rc + ) +endif(MSVC) + list(APPEND gnuradio_fec_libs gnuradio-core ${Boost_LIBRARIES} diff --git a/gr-fec/lib/gnuradio-fec.rc.in b/gr-fec/lib/gnuradio-fec.rc.in new file mode 100644 index 0000000000..bbdeb7f66a --- /dev/null +++ b/gr-fec/lib/gnuradio-fec.rc.in @@ -0,0 +1,55 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#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-fec" + VALUE "FileVersion", "@VERSION@" + VALUE "InternalName", "gnuradio-fec.dll" + VALUE "LegalCopyright", "Licensed under GPLv3 or any later version" + VALUE "OriginalFilename", "gnuradio-fec.dll" + VALUE "ProductName", "gnuradio-fec" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END + END |