diff options
Diffstat (limited to 'plugins')
27 files changed, 334 insertions, 26 deletions
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt index 9d9a5aac8f..1868831c4b 100644 --- a/plugins/docsis/CMakeLists.txt +++ b/plugins/docsis/CMakeLists.txt @@ -19,6 +19,31 @@ # 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 docsis) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 5) +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) + +# The sources for the plugin set(DISSECTOR_SRC packet-bintrngreq.c packet-bpkmattr.c @@ -92,7 +117,7 @@ register_dissector_files(plugin.c add_library(docsis ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(docsis PROPERTIES diff --git a/plugins/docsis/plugin.rc.in b/plugins/docsis/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/docsis/plugin.rc.in +++ b/plugins/docsis/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" diff --git a/plugins/easy_codec/ReadMe.txt b/plugins/easy_codec/ReadMe.txt index d403642a38..e85783704f 100644 --- a/plugins/easy_codec/ReadMe.txt +++ b/plugins/easy_codec/ReadMe.txt @@ -9,5 +9,6 @@ Instructions on compiling the Easy Codecs 2. Build plugin. Win32: nmake -f makefile.nmake Linux: TO DO + CMake: TO DO diff --git a/plugins/easy_codec/plugin.rc.in b/plugins/easy_codec/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/easy_codec/plugin.rc.in +++ b/plugins/easy_codec/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" diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt index 46d7a00622..3b07a4407f 100644 --- a/plugins/ethercat/CMakeLists.txt +++ b/plugins/ethercat/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 ethercat) +set(MODULE_VERSION_MAJOR 0) +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 VERISON 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-ams.c packet-ecatmb.c @@ -55,7 +79,7 @@ register_dissector_files(plugin.c add_library(ethercat ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(ethercat PROPERTIES diff --git a/plugins/ethercat/plugin.rc.in b/plugins/ethercat/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/ethercat/plugin.rc.in +++ b/plugins/ethercat/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" diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt index 22eeae68af..9dca0f8a2b 100644 --- a/plugins/gryphon/CMakeLists.txt +++ b/plugins/gryphon/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 gryphon) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 4) +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-gryphon.c ) @@ -49,7 +73,7 @@ register_dissector_files(plugin.c add_library(gryphon ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(gryphon PROPERTIES diff --git a/plugins/gryphon/plugin.rc.in b/plugins/gryphon/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/gryphon/plugin.rc.in +++ b/plugins/gryphon/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" diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt index aa7d891fa5..67f168c575 100644 --- a/plugins/irda/CMakeLists.txt +++ b/plugins/irda/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 irda) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 6) +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-ircomm.c packet-irda.c @@ -51,7 +75,7 @@ register_dissector_files(plugin.c add_library(irda ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(irda PROPERTIES diff --git a/plugins/irda/plugin.rc.in b/plugins/irda/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/irda/plugin.rc.in +++ b/plugins/irda/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" diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt index 6a779b909b..5cb5c9923f 100644 --- a/plugins/m2m/CMakeLists.txt +++ b/plugins/m2m/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 m2m) +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-m2m.c ) @@ -54,7 +78,7 @@ register_dissector_files(plugin.c add_library(m2m ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(m2m PROPERTIES diff --git a/plugins/m2m/plugin.rc.in b/plugins/m2m/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/m2m/plugin.rc.in +++ b/plugins/m2m/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" diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index e4dc6fe3b9..6372e54d1b 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/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 mate) +set(MODULE_VERSION_MAJOR 1) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 0) +set(MODULE_VERSION_EXTRA 1) +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-mate.c ) @@ -70,7 +94,7 @@ register_dissector_files(plugin.c add_library(mate ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(mate PROPERTIES diff --git a/plugins/mate/plugin.rc.in b/plugins/mate/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/mate/plugin.rc.in +++ b/plugins/mate/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" diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt index a25e0fdfa7..8feeff1b0b 100644 --- a/plugins/opcua/CMakeLists.txt +++ b/plugins/opcua/CMakeLists.txt @@ -19,6 +19,27 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +# This info is from moduleinfo.nmake +set(PACKAGE opcua) +set(MODULE_VERSION_MAJOR 1) +set(MODULE_VERSION_MINOR 0) +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 opcua.c ) @@ -64,7 +85,7 @@ register_dissector_files(plugin.c add_library(opcua ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(opcua PROPERTIES diff --git a/plugins/opcua/plugin.rc.in b/plugins/opcua/plugin.rc.in index 665276e936..0ad7587981 100644 --- a/plugins/opcua/plugin.rc.in +++ b/plugins/opcua/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" diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt index 48d1791424..45ff67ff92 100644 --- a/plugins/profinet/CMakeLists.txt +++ b/plugins/profinet/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 profinet) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 2) +set(MODULE_VERSION_MICRO 4) +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-dcerpc-pn-io.c packet-dcom-cba.c @@ -61,7 +85,7 @@ register_dissector_files(plugin.c add_library(profinet ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(profinet PROPERTIES diff --git a/plugins/profinet/plugin.rc.in b/plugins/profinet/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/profinet/plugin.rc.in +++ b/plugins/profinet/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" diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt index dfe20daaa2..7cd16448bc 100644 --- a/plugins/stats_tree/CMakeLists.txt +++ b/plugins/stats_tree/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 stats_tree) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 1) +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(TAP_SRC stats_tree_plugin.c pinfo_stats_tree.c @@ -38,7 +62,7 @@ endif() add_library(stats_tree ${LINK_MODE_MODULE} ${TAP_SRC} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(stats_tree PROPERTIES diff --git a/plugins/stats_tree/plugin.rc.in b/plugins/stats_tree/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/stats_tree/plugin.rc.in +++ b/plugins/stats_tree/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" diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt index d6b678bdcd..f60689a402 100644 --- a/plugins/unistim/CMakeLists.txt +++ b/plugins/unistim/CMakeLists.txt @@ -19,6 +19,27 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # +# This info is from moduleinfo.nmake +set(PACKAGE unistim) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 2) +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-unistim.c ) @@ -49,7 +70,7 @@ register_dissector_files(plugin.c add_library(unistim ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(unistim PROPERTIES 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" diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt index 0022b57d29..96d2a98e99 100644 --- a/plugins/wimaxasncp/CMakeLists.txt +++ b/plugins/wimaxasncp/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 wimaxasncp) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 1) +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-wimaxasncp.c ) @@ -53,7 +77,7 @@ register_dissector_files(plugin.c add_library(wimaxasncp ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(wimaxasncp PROPERTIES diff --git a/plugins/wimaxasncp/plugin.rc.in b/plugins/wimaxasncp/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/wimaxasncp/plugin.rc.in +++ b/plugins/wimaxasncp/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" diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt index f524915208..657dd1d380 100644 --- a/plugins/wimaxmacphy/CMakeLists.txt +++ b/plugins/wimaxmacphy/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 wimaxmacphy) +set(MODULE_VERSION_MAJOR 0) +set(MODULE_VERSION_MINOR 0) +set(MODULE_VERSION_MICRO 1) +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-wimaxmacphy.c ) @@ -49,7 +73,7 @@ register_dissector_files(plugin.c add_library(wimaxmacphy ${LINK_MODE_MODULE} ${PLUGIN_FILES} - plugin.rc + ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc ) set_target_properties(wimaxmacphy PROPERTIES diff --git a/plugins/wimaxmacphy/plugin.rc.in b/plugins/wimaxmacphy/plugin.rc.in index 568dc07b49..cac1f406ac 100644 --- a/plugins/wimaxmacphy/plugin.rc.in +++ b/plugins/wimaxmacphy/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" |