osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Finish splitting ADD_PLUGIN_LIBRARY. 

Rename add_plugin_library to add_wireshark_plugin_library and add a
backward compatibility wrapper. Make Falco Bridge a Logwolf plugin.
This commit is contained in:
Gerald Combs 2022-04-04 11:32:53 -07:00
parent 4f3017c000
commit 57172fe4cd
24 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/modules/WiresharkPlugin.cmake
View File

@ -28,7 +28,7 @@ macro(SET_MODULE_INFO _plugin _ver_major _ver_minor _ver_micro _ver_extra)
add_definitions(-DPLUGIN_VERSION=\"${PLUGIN_VERSION}\") add_definitions(-DPLUGIN_VERSION=\"${PLUGIN_VERSION}\")
endmacro() endmacro()
macro(ADD_PLUGIN_LIBRARY _plugin _subfolder) macro(ADD_WIRESHARK_PLUGIN_LIBRARY _plugin _subfolder)
add_library(${_plugin} MODULE add_library(${_plugin} MODULE
${PLUGIN_FILES} ${PLUGIN_FILES}
${PLUGIN_RC_FILE} ${PLUGIN_RC_FILE}
@ -53,8 +53,13 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
add_dependencies(plugins ${_plugin}) add_dependencies(plugins ${_plugin})
endmacro() endmacro()
macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
message(WARNING "${CMAKE_PARENT_LIST_FILE}: add_plugin_library is deprecated. Use add_wireshark_plugin_library instead.")
ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
endmacro()
macro(ADD_LOGWOLF_PLUGIN_LIBRARY _plugin _subfolder) macro(ADD_LOGWOLF_PLUGIN_LIBRARY _plugin _subfolder)
ADD_PLUGIN_LIBRARY(${_plugin} ${_subfolder}) ADD_WIRESHARK_PLUGIN_LIBRARY(${_plugin} ${_subfolder})
set_target_properties(${_plugin} PROPERTIES set_target_properties(${_plugin} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LOGWOLF_PLUGIN_DIR}/${_subfolder} LIBRARY_OUTPUT_DIRECTORY ${LOGWOLF_PLUGIN_DIR}/${_subfolder}

2
plugins/codecs/G711/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(g711 codecs) add_wireshark_plugin_library(g711 codecs)
target_include_directories(g711 PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(g711 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/G722/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(g722 codecs) add_wireshark_plugin_library(g722 codecs)
target_include_directories(g722 PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(g722 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/G726/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(g726 codecs) add_wireshark_plugin_library(g726 codecs)
target_include_directories(g726 PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(g726 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/G729/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(g729 codecs) add_wireshark_plugin_library(g729 codecs)
target_include_directories(g729 PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(g729 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/iLBC/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(ilbc codecs) add_wireshark_plugin_library(ilbc codecs)
target_include_directories(ilbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(ilbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/l16_mono/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(l16mono codecs) add_wireshark_plugin_library(l16mono codecs)
target_include_directories(l16mono PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(l16mono PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/opus_dec/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(opus_dec codecs) add_wireshark_plugin_library(opus_dec codecs)
target_include_directories(opus_dec PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(opus_dec PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/codecs/sbc/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${CODEC_SRC} ${CODEC_SRC}
) )
add_plugin_library(sbc codecs) add_wireshark_plugin_library(sbc codecs)
target_include_directories(sbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs) target_include_directories(sbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)

2
plugins/epan/ethercat/CMakeLists.txt
View File

@ -38,7 +38,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(ethercat epan) add_wireshark_plugin_library(ethercat epan)
target_link_libraries(ethercat epan) target_link_libraries(ethercat epan)

2
plugins/epan/falco_bridge/CMakeLists.txt
View File

@ -33,7 +33,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(falco-bridge epan) add_logwolf_plugin_library(falco-bridge epan)
# XXX Hacks; need to fix in falcosecurity-libs. # XXX Hacks; need to fix in falcosecurity-libs.
target_compile_definitions(falco-bridge PRIVATE target_compile_definitions(falco-bridge PRIVATE

2
plugins/epan/gryphon/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(gryphon epan) add_wireshark_plugin_library(gryphon epan)
target_link_libraries(gryphon epan) target_link_libraries(gryphon epan)

2
plugins/epan/irda/CMakeLists.txt
View File

@ -34,7 +34,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(irda epan) add_wireshark_plugin_library(irda epan)
target_link_libraries(irda epan) target_link_libraries(irda epan)

2
plugins/epan/mate/CMakeLists.txt
View File

@ -48,7 +48,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SUPPORT_SRC} ${DISSECTOR_SUPPORT_SRC}
) )
add_plugin_library(mate epan) add_wireshark_plugin_library(mate epan)
target_link_libraries(mate epan) target_link_libraries(mate epan)

2
plugins/epan/opcua/CMakeLists.txt
View File

@ -48,7 +48,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SUPPORT_SRC} ${DISSECTOR_SUPPORT_SRC}
) )
add_plugin_library(opcua epan) add_wireshark_plugin_library(opcua epan)
target_link_libraries(opcua epan) target_link_libraries(opcua epan)

2
plugins/epan/pluginifdemo/CMakeLists.txt
View File

@ -50,7 +50,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(pluginifdemo epan) add_wireshark_plugin_library(pluginifdemo epan)
target_link_libraries(pluginifdemo epan Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia) target_link_libraries(pluginifdemo epan Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::Multimedia)

2
plugins/epan/profinet/CMakeLists.txt
View File

@ -47,7 +47,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SUPPORT_SRC} ${DISSECTOR_SUPPORT_SRC}
) )
add_plugin_library(profinet epan) add_wireshark_plugin_library(profinet epan)
target_link_libraries(profinet epan) target_link_libraries(profinet epan)

2
plugins/epan/stats_tree/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${TAP_SRC} ${TAP_SRC}
) )
add_plugin_library(stats_tree epan) add_wireshark_plugin_library(stats_tree epan)
target_link_libraries(stats_tree epan) target_link_libraries(stats_tree epan)

2
plugins/epan/transum/CMakeLists.txt
View File

@ -39,7 +39,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SUPPORT_SRC} ${DISSECTOR_SUPPORT_SRC}
) )
add_plugin_library(transum epan) add_wireshark_plugin_library(transum epan)
target_link_libraries(transum epan) target_link_libraries(transum epan)

2
plugins/epan/unistim/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(unistim epan) add_wireshark_plugin_library(unistim epan)
target_link_libraries(unistim epan) target_link_libraries(unistim epan)

2
plugins/epan/wimax/CMakeLists.txt
View File

@ -79,7 +79,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SUPPORT_SRC} ${DISSECTOR_SUPPORT_SRC}
) )
add_plugin_library(wimax epan) add_wireshark_plugin_library(wimax epan)
target_link_libraries(wimax epan) target_link_libraries(wimax epan)

2
plugins/epan/wimaxasncp/CMakeLists.txt
View File

@ -36,7 +36,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(wimaxasncp epan) add_wireshark_plugin_library(wimaxasncp epan)
target_link_libraries(wimaxasncp epan) target_link_libraries(wimaxasncp epan)

2
plugins/epan/wimaxmacphy/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${DISSECTOR_SRC} ${DISSECTOR_SRC}
) )
add_plugin_library(wimaxmacphy epan) add_wireshark_plugin_library(wimaxmacphy epan)
target_link_libraries(wimaxmacphy epan) target_link_libraries(wimaxmacphy epan)

2
plugins/wiretap/usbdump/CMakeLists.txt
View File

@ -32,7 +32,7 @@ register_plugin_files(plugin.c
${WIRETAP_SRC} ${WIRETAP_SRC}
) )
add_plugin_library(usbdump wiretap) add_wireshark_plugin_library(usbdump wiretap)
target_include_directories(usbdump PRIVATE ${CMAKE_SOURCE_DIR}/wiretap) target_include_directories(usbdump PRIVATE ${CMAKE_SOURCE_DIR}/wiretap)