diff options
| author | João Valverde <j@v6e.pt> | 2021-07-03 12:58:30 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-04 10:37:49 +0000 |
| commit | 100876337af28f9e86259e0a17e28d1ea1b737a2 (patch) | |
| tree | a366f31adae1393872c124b3fa8719f2d5cd0dd5 /fuzz | |
| parent | 47d2afd99018b5ef85376e1ff81ee11af4483fa3 (diff) | |
Move version_info.[ch] to ui/
Version info is an aspect of UI implementation so move it to
a more appropriate place, such as ui/. This also helps declutter
the top-level.
A static library is appropriate to encapsulate the dependencies
as private and it is better supported by CMake than object libraries.
Also version_info.h should not be installed as a public header.
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | fuzz/fuzzshark.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt index 9e9598badc..c4229922b5 100644 --- a/fuzz/CMakeLists.txt +++ b/fuzz/CMakeLists.txt @@ -30,7 +30,7 @@ set(fuzzshark_LIBS ui wiretap epan - ${VERSION_INFO_LIBS} + version_info ) if(OSS_FUZZ) if("$ENV{LIB_FUZZING_ENGINE}" STREQUAL "") @@ -40,7 +40,6 @@ if(OSS_FUZZ) endif() set(fuzzshark_FILES fuzzshark.c - $<TARGET_OBJECTS:version_info> ) set(FUZZ_LINK_FLAGS "${WS_LINK_FLAGS}") if(ENABLE_FUZZER) diff --git a/fuzz/fuzzshark.c b/fuzz/fuzzshark.c index fdf25d64c3..162f23f56a 100644 --- a/fuzz/fuzzshark.c +++ b/fuzz/fuzzshark.c @@ -26,7 +26,7 @@ #include <wsutil/privileges.h> #include <wsutil/report_message.h> #include <wsutil/wslog.h> -#include <version_info.h> +#include <ui/version_info.h> #include <wiretap/wtap.h> |