osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Switch GLib back to PUBLIC. 

379352ef7f / !3603 removed GLib from the INTERFACE_LINK_LIBRARIES and
INTERFACE_INCLUDE_DIRECTORIES properties for the epan target. This broke
external plugin development as discussed in !3891, so switch it back.
This commit is contained in:
Gerald Combs 2021-08-23 16:30:13 -07:00 committed by Wireshark GitLab Utility
parent 3d7729c6b3
commit c52c50b944
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/CMakeLists.txt
View File

@ -320,12 +320,12 @@ target_link_libraries(epan
PUBLIC
wiretap
wsutil
${GLIB2_LIBRARIES}
PRIVATE
${BROTLI_LIBRARIES}
${CARES_LIBRARIES}
${GCRYPT_LIBRARIES}
${GIO2_LIBRARIES}
${GLIB2_LIBRARIES}
${GNUTLS_LIBRARIES}
${GTHREAD2_LIBRARIES}
${KERBEROS_LIBRARIES}
@ -342,6 +342,11 @@ target_link_libraries(epan
${ZSTD_LIBRARIES}
)
target_include_directories(epan
SYSTEM PUBLIC
${GLIB2_INCLUDE_DIRS}
)
target_include_directories(epan
INTERFACE
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>