From 48d376fbb2d8adeff6dbc724289fdb85938228bd Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 2 Mar 2015 00:16:16 +0100 Subject: [PATCH] plugins: fix dissector registration with CMake Noticed when comparing output of `tshark -G fields` between autofoo and cmake builds. With this change, I see no differences anymore. While only WiMax needs this change, do a similar thing for consistency with autofoo and between dissectors (actually, the contents of ${PLUGIN_FILES} minus plugin.c was used). Change-Id: Ib61f69dcc0b8eda713da931b6cc3e946848bea9d Reviewed-on: https://code.wireshark.org/review/7462 Reviewed-by: Evan Huus Reviewed-by: Jeff Morriss --- plugins/m2m/CMakeLists.txt | 1 + plugins/mate/CMakeLists.txt | 1 + plugins/opcua/CMakeLists.txt | 1 + plugins/profinet/CMakeLists.txt | 1 + plugins/wimax/CMakeLists.txt | 1 + 5 files changed, 5 insertions(+) diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt index 5df4d3c284..052253b8c2 100644 --- a/plugins/m2m/CMakeLists.txt +++ b/plugins/m2m/CMakeLists.txt @@ -55,6 +55,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) register_dissector_files(plugin.c plugin ${DISSECTOR_SRC} + ${DISSECTOR_SUPPORT_SRC} ) add_plugin_library(m2m) diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt index 66e76c95ad..f800e21f37 100644 --- a/plugins/mate/CMakeLists.txt +++ b/plugins/mate/CMakeLists.txt @@ -71,6 +71,7 @@ endif() register_dissector_files(plugin.c plugin ${DISSECTOR_SRC} + ${DISSECTOR_SUPPORT_SRC} ) add_plugin_library(mate) diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt index d628f8d965..75d4cd5126 100644 --- a/plugins/opcua/CMakeLists.txt +++ b/plugins/opcua/CMakeLists.txt @@ -65,6 +65,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) register_dissector_files(plugin.c plugin ${DISSECTOR_SRC} + ${DISSECTOR_SUPPORT_SRC} ) add_plugin_library(opcua) diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt index 30bf96f3aa..a7cbc3914b 100644 --- a/plugins/profinet/CMakeLists.txt +++ b/plugins/profinet/CMakeLists.txt @@ -62,6 +62,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) register_dissector_files(plugin.c plugin ${DISSECTOR_SRC} + ${DISSECTOR_SUPPORT_SRC} ) add_plugin_library(profinet) diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt index b16646575c..5ae094465d 100644 --- a/plugins/wimax/CMakeLists.txt +++ b/plugins/wimax/CMakeLists.txt @@ -95,6 +95,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) register_dissector_files(plugin.c plugin ${DISSECTOR_SRC} + ${DISSECTOR_SUPPORT_SRC} ) add_plugin_library(wimax)