Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove overly cautious caching #99

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ZeekPlugin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function (zeek_plugin_bootstrapping)
# Plugins that build against the source tree set ZEEK_DIST. Here, we have our
# package file plus ZeekPluginConfig.cmake to help out.
if (ZEEK_DIST)
message("USING ZEEK_DIST: ${ZEEK_DIST}")
message("-- Using ZEEK_DIST: ${ZEEK_DIST}")
find_package(Zeek REQUIRED CONFIG NO_DEFAULT_PATH PATHS "${ZEEK_DIST}/build")
return()
endif ()
Expand Down Expand Up @@ -64,10 +64,8 @@ function (zeek_plugin_bootstrapping)
endfunction ()

# Make sure BifCl and BinPAC are available.
if (NOT ZEEK_PLUGIN_INTERNAL_BUILD AND NOT ZEEK_PLUGIN_HAD_BOOTSTRAPPING)
if (NOT ZEEK_PLUGIN_INTERNAL_BUILD)
zeek_plugin_bootstrapping()
# Remember that we have called the function to not call it again.
set(ZEEK_PLUGIN_HAD_BOOTSTRAPPING ON CACHE BOOL "Plugin bootstrapping has completed." FORCE)
endif ()

include(BifCl)
Expand Down
Loading