diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-12-15 22:13:59 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-12-17 11:47:07 +0000 |
| commit | ee8ca2e1d793e039bdd7304ad3c2c0cb42a69624 (patch) | |
| tree | 73826b3cb2cffddbc5d5b31d5b8794ee68c40cb0 /cmake | |
| parent | f37e759f41da97a2121934d17b0ec2d895c3af15 (diff) | |
plugin.rc.in: Cleanup some unnecessary code
Also add comment noting that MSVC_VARIANT is not the same thing as
CMAKE_GENERATOR.
Change-Id: Icc0f4a491786e4045c650509957655ef41352b29
Reviewed-on: https://code.wireshark.org/review/24846
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 540fb118a7..5e652ce558 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -4,9 +4,7 @@ macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra) if(WIN32) # 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 - - set(PACKAGE ${_plugin}) + set(MODULE_NAME ${_plugin}) set(MODULE_VERSION_MAJOR ${_ver_major}) set(MODULE_VERSION_MINOR ${_ver_minor}) set(MODULE_VERSION_MICRO ${_ver_micro}) @@ -14,14 +12,9 @@ macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra) 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.am - set(PLUGIN_NAME ${PACKAGE}) - + # XXX This is wrong 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 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plugin.rc.in) set(_plugin_rc_in ${CMAKE_CURRENT_SOURCE_DIR}/plugin.rc.in) |