Zeek 6.0 compatibility and updates #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is the version taken straight from the zeek-aux repository.
This is needed for Zeek 6.1 and later.
This has been the suggested way for plugins to do since Zeek 3.2. Closes napatech#1
Generally, using `zeek-config` from an installation tree should be preferred if possible.
Squelches the following warning: CMake Warning (dev) at /usr/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:438 (message): The package name passed to `find_package_handle_standard_args` (NAPATECH) does not match the name of the calling package (Napatech). This can lead to problems in calling code that expects `find_package` result variables (e.g., `_FOUND`) to follow a certain pattern. Call Stack (most recent call first): cmake/FindNapatech.cmake:31 (find_package_handle_standard_args) CMakeLists.txt:7 (find_package) This warning is for project developers. Use -Wno-dev to suppress it.
Author
|
Hi @awelzel, Thanks for taking your time to work on this, and yes it does work now. The only issue still is that you cant use zkg to install the package as for whatever reason, it still configures the package with old --bro-dist option. However this is not related to this project but rather zkg itself. Thank you for this ! |
awelzel
force-pushed
the
topic/awelzel/1-include-path-fixes
branch
from
94afd9f to
ed9d578
Compare
Do not use --bro-dist (or --zeek-dist), but do allow the user to configure the Napatech installation directory.
awelzel
force-pushed
the
topic/awelzel/1-include-path-fixes
branch
from
ed9d578 to
30805b3
Compare
Author
I've pushed a follow-up to remove the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@stachdude - could you see if these changes work for you? I do not have a Napatech card readily available, but downloading/installing the SDK compiles and loads it at least for me against the latest Zeek master branch:
Hope you can figure out the rest :-)
Main part are the include paths, but I updated some of the configure/build infrastructure. See the individual commits.