aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2021-06-21 10:43:41 -0700
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-06-22 22:17:42 +0000
commit4609bc4ad526707bb301acb2f4ecdf51762cd533 (patch)
tree1647a808291f4d5b2c5d8c0af713074c684cb42c
parentc2bcb295ac2329a1c491a569ad8ad7eec4089050 (diff)
CMake: Mark our plugin include directories PRIVATE.
Use target_include_directories to mark our local include directories PRIVATE, similar to what we do elsewhere.
-rw-r--r--cmake/modules/WiresharkPlugin.cmake2
-rw-r--r--plugins/codecs/G711/CMakeLists.txt2
-rw-r--r--plugins/codecs/G722/CMakeLists.txt2
-rw-r--r--plugins/codecs/G726/CMakeLists.txt2
-rw-r--r--plugins/codecs/G729/CMakeLists.txt2
-rw-r--r--plugins/codecs/iLBC/CMakeLists.txt2
-rw-r--r--plugins/codecs/l16_mono/CMakeLists.txt2
-rw-r--r--plugins/codecs/opus_dec/CMakeLists.txt2
-rw-r--r--plugins/codecs/sbc/CMakeLists.txt2
-rw-r--r--plugins/wiretap/usbdump/CMakeLists.txt2
10 files changed, 20 insertions, 0 deletions
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake
index 82a3709c56..dc5926807a 100644
--- a/cmake/modules/WiresharkPlugin.cmake
+++ b/cmake/modules/WiresharkPlugin.cmake
@@ -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}"
diff --git a/plugins/codecs/G711/CMakeLists.txt b/plugins/codecs/G711/CMakeLists.txt
index ec91fcef6e..2b0d6ff23d 100644
--- a/plugins/codecs/G711/CMakeLists.txt
+++ b/plugins/codecs/G711/CMakeLists.txt
@@ -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)
diff --git a/plugins/codecs/G722/CMakeLists.txt b/plugins/codecs/G722/CMakeLists.txt
index 41c3f3788d..5807d4915d 100644
--- a/plugins/codecs/G722/CMakeLists.txt
+++ b/plugins/codecs/G722/CMakeLists.txt
@@ -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})
diff --git a/plugins/codecs/G726/CMakeLists.txt b/plugins/codecs/G726/CMakeLists.txt
index 1ac0110a5e..8eac543891 100644
--- a/plugins/codecs/G726/CMakeLists.txt
+++ b/plugins/codecs/G726/CMakeLists.txt
@@ -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})
diff --git a/plugins/codecs/G729/CMakeLists.txt b/plugins/codecs/G729/CMakeLists.txt
index 04106806c9..2a301ea279 100644
--- a/plugins/codecs/G729/CMakeLists.txt
+++ b/plugins/codecs/G729/CMakeLists.txt
@@ -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})
diff --git a/plugins/codecs/iLBC/CMakeLists.txt b/plugins/codecs/iLBC/CMakeLists.txt
index e5c998e55f..7b0737f3c0 100644
--- a/plugins/codecs/iLBC/CMakeLists.txt
+++ b/plugins/codecs/iLBC/CMakeLists.txt
@@ -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})
diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt
index 3df3c87637..4deb0ff2c6 100644
--- a/plugins/codecs/l16_mono/CMakeLists.txt
+++ b/plugins/codecs/l16_mono/CMakeLists.txt
@@ -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)
diff --git a/plugins/codecs/opus_dec/CMakeLists.txt b/plugins/codecs/opus_dec/CMakeLists.txt
index f744e721ef..84e19ed974 100644
--- a/plugins/codecs/opus_dec/CMakeLists.txt
+++ b/plugins/codecs/opus_dec/CMakeLists.txt
@@ -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})
diff --git a/plugins/codecs/sbc/CMakeLists.txt b/plugins/codecs/sbc/CMakeLists.txt
index c08bee9c99..e787d188ed 100644
--- a/plugins/codecs/sbc/CMakeLists.txt
+++ b/plugins/codecs/sbc/CMakeLists.txt
@@ -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})
diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt
index 1ca80ed3c2..25acb5d95e 100644
--- a/plugins/wiretap/usbdump/CMakeLists.txt
+++ b/plugins/wiretap/usbdump/CMakeLists.txt
@@ -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)