Add an include sub-directory to the tree

Blind attempt to fix Debian package brokenness managing
headers separately from install rules.

Global public headers that don't fit any of the Wireshark
libraries should be placed in include/.

Eventually the C files in the root dir should be placed somewhere
else as well (like src/) but this is not a priority.

Fixes #17726.
This commit is contained in:
João Valverde 2021-11-11 18:09:22 +00:00 committed by Wireshark GitLab Utility
parent 76c4ca4059
commit ca06d7e4fe
8 changed files with 8 additions and 10 deletions

View File

@ -393,6 +393,7 @@ endif()
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/include
)
if( DUMPCAP_INSTALL_OPTION STREQUAL "suid" )
@ -3439,12 +3440,12 @@ set(SHARK_PUBLIC_HEADERS
cfile.h
cli_main.h
file.h
ws_attributes.h
ws_compiler_tests.h
ws_diag_control.h
ws_log_defs.h
ws_symbol_export.h
wireshark.h
include/ws_attributes.h
include/ws_compiler_tests.h
include/ws_diag_control.h
include/ws_log_defs.h
include/ws_symbol_export.h
include/wireshark.h
${CMAKE_BINARY_DIR}/ws_version.h
)

View File

@ -1,7 +1,4 @@
usr/lib/*/libwsutil.so
ws_attributes.h usr/include/wireshark
ws_compiler_tests.h usr/include/wireshark
ws_diag_control.h usr/include/wireshark
ws_symbol_export.h usr/include/wireshark
include/*.h usr/include/wireshark
wsutil/*.h usr/include/wireshark/wsutil
wsutil/wmem/*.h usr/include/wireshark/wsutil/wmem