Always install zeek-archiver, not optionally like adtrace and rst #50
Conversation
This file contains 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
timwoj
reviewed
Apr 19, 2024
ckreibich
force-pushed
the
topic/christian/always-install-zeek-archiver
branch
from
85c309e
to
3595ec3
Compare
timwoj
approved these changes
Apr 20, 2024
bbannier
reviewed
Apr 22, 2024
zeek-archiver/CMakeLists.txt
Outdated
| @@ -3,4 +3,4 @@ add_executable(zeek-archiver zeek-archiver.cc) | |||
| set_target_properties(zeek-archiver PROPERTIES COMPILE_FLAGS | |||
| "-std=c++17 -Wall -Wno-unused -Werror=vla") | |||
|
|
|||
| AddAuxInstallTarget(zeek-archiver) | |||
| install(TARGETS zeek-archiver DESTINATION bin) | |||
There was a problem hiding this comment.
Since the zeek-archive target was declared with add_program CMake knows it needs to go into bin/, so DESTINATION is not required (or might even interfere with what was patched into GNUInstallDirs). I'd suggest we drop it here and also for zeek-cut below.
Suggested change
| install(TARGETS zeek-archiver DESTINATION bin) | |
| install(TARGETS zeek-archiver) |
There was a problem hiding this comment.
Ah nice — I did not know that. Done.
Also move zeek-cut's install() into the submodule, for consistency with its manpage installation.
ckreibich
force-pushed
the
topic/christian/always-install-zeek-archiver
branch
from
3595ec3
to
2db2c53
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I overlooked that zeek-archiver is not like rst or adtrace — we currently always install it, so let's keep doing that.