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

CMake: Mark our plugin include directories PRIVATE. 

Use target_include_directories to mark our local include directories
PRIVATE, similar to what we do elsewhere.
This commit is contained in:
Gerald Combs 2021-06-21 10:43:41 -07:00 committed by Wireshark GitLab Utility
parent c2bcb295ac
commit 4609bc4ad5
10 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/WiresharkPlugin.cmake
View File

@ -34,6 +34,8 @@ macro(ADD_PLUGIN_LIBRARY _plugin _subfolder)
${PLUGIN_RC_FILE}
)
target_include_directories(${_plugin} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(${_plugin} PROPERTIES
PREFIX ""
LINK_FLAGS "${WS_LINK_FLAGS}"

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(g711 codecs)
target_include_directories(g711 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(g711 wsutil)
install_plugin(g711 codecs)

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(g722 codecs)
target_include_directories(g722 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(g722 wsutil ${SPANDSP_LIBRARIES})
target_include_directories(g722 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(g726 codecs)
target_include_directories(g726 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(g726 wsutil ${SPANDSP_LIBRARIES})
target_include_directories(g726 SYSTEM PRIVATE ${SPANDSP_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(g729 codecs)
target_include_directories(g729 PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(g729 wsutil ${BCG729_LIBRARIES})
target_include_directories(g729 SYSTEM PRIVATE ${BCG729_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(ilbc codecs)
target_include_directories(ilbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(ilbc wsutil ${ILBC_LIBRARIES})
target_include_directories(ilbc SYSTEM PRIVATE ${ILBC_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(l16mono codecs)
target_include_directories(l16mono PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(l16mono wsutil)
install_plugin(l16mono codecs)

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(opus_dec codecs)
target_include_directories(opus_dec PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(opus_dec wsutil ${OPUS_LIBRARIES})
target_include_directories(opus_dec SYSTEM PRIVATE ${OPUS_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(sbc codecs)
target_include_directories(sbc PRIVATE ${CMAKE_SOURCE_DIR}/codecs)
target_link_libraries(sbc wsutil ${SBC_LIBRARIES})
target_include_directories(sbc SYSTEM PRIVATE ${SBC_INCLUDE_DIRS})

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

@ -34,6 +34,8 @@ register_plugin_files(plugin.c
add_plugin_library(usbdump wiretap)
target_include_directories(usbdump PRIVATE ${CMAKE_SOURCE_DIR}/wiretap)
target_link_libraries(usbdump wiretap)
install_plugin(usbdump wiretap)