diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-10 21:29:57 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-11 20:22:32 +0000 |
| commit | 528a8572582116a93e660ca93cdee36809b13b96 (patch) | |
| tree | 250159b9a9000773d870b10bfa65726d9ed04e13 /plugins/wimax | |
| parent | 7d004dc887bcecb404241604242004edb6f6ceaa (diff) | |
| download | wireshark-528a8572582116a93e660ca93cdee36809b13b96.tar.gz | |
Fix CMake generation and use of Windows .rc files
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.
The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake. The path is removed for nmake builds.
Updated build architecture detection, required for wireshark.manifest.in
Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'plugins/wimax')
| -rw-r--r-- | plugins/wimax/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | plugins/wimax/plugin.rc.in | 2 |
2 files changed, 26 insertions, 2 deletions
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt index 6b2e1ea4e0..77a146c22c 100644 --- a/plugins/wimax/CMakeLists.txt +++ b/plugins/wimax/CMakeLists.txt @@ -19,6 +19,30 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +# Create the Windows .rc file for the plugin. +# The values come from several files in the source, I can't see how to reuse them + +# This info is from moduleinfo.nmake +set(PACKAGE wimax) +set(MODULE_VERSION_MAJOR 1) +set(MODULE_VERSION_MINOR 1) +set(MODULE_VERSION_MICRO 0) +set(MODULE_VERSION_EXTRA 0) +set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}") +set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}") + +# This info is from Makefile.common +set(PLUGIN_NAME ${PACKAGE}) + +# This info is from config.nmake +set(MSVC_VARIANT "${CMAKE_GENERATOR}") + +# The rc.in requires a plain VERSION variable +set(VERSION ${PROJECT_VERSION}) + +# Create the plugin.rc file from the template +configure_file(plugin.rc.in plugin.rc @ONLY) + set(DISSECTOR_SRC packet-wmx.c ) @@ -94,7 +118,7 @@ register_dissector_files(plugin.c add_library(wimax ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(wimax PROPERTIES diff --git a/plugins/wimax/plugin.rc.in b/plugins/wimax/plugin.rc.in index 47bd20049f..e63db077fb 100644 --- a/plugins/wimax/plugin.rc.in +++ b/plugins/wimax/plugin.rc.in @@ -24,7 +24,7 @@ BEGIN VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" VALUE "ProductName", "Wireshark\0" VALUE "ProductVersion", "@VERSION@\0" - VALUE "Comments", "Build with @MSVC_VARIANT@\0" + VALUE "Comments", "Built with @MSVC_VARIANT@\0" END END BLOCK "VarFileInfo" |