mirror of
https://github.com/zeek/zeek.git
synced 2025-10-01 22:28:20 +00:00
Merge remote-tracking branch 'origin/master' into topic/johanna/spicy-tls
* origin/master: (89 commits) Update doc submodule [nomail] [skip ci] Bump cmake submodule [nomail] testing/btest: Default to HILTI_JIT_PARALLELISM=1 Revert "CI: Use ccache and a single CPU when building spicy analyzers for btests" Update doc submodule [nomail] [skip ci] CI: Use ccache and a single CPU when building spicy analyzers for btests Extend btest for logging of disabled analyzers Update zeek-aux submodule [nomail] Add logging of disabled analyzers to analyzer.log Bump auxil/spicy to latest development snapshot Management framework: bump cluster testsuite to pull in telemetry tests Management framework: bump zeek-client Management framework: augment deployed configs with instance IP addresses Management framework: add auto-enumeration of metrics ports Management framework: propagate metrics port from agent Management framework: add metrics port in management & Supervisor node records Harden the telemetry manager against unset Telemetry::metrics_address Comment-only tweaks for telemetry-related settings. Fix for --display-cmake in configure Moved build directory creation further down in the script so that --display-cmake has a chance to happen before build tree setup. Update submodules [nomail] ...
This commit is contained in:
commit
4acd0297b0
169 changed files with 4540 additions and 1553 deletions
26
configure
vendored
26
configure
vendored
|
@ -462,6 +462,19 @@ if [ -z "$CMakeCommand" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
echo "Using $(cmake --version | head -1)"
|
||||
echo
|
||||
if [ -n "$CMakeGenerator" ]; then
|
||||
cmake="${CMakeCommand} -G ${CMakeGenerator} ${CMakeCacheEntries} ${sourcedir}"
|
||||
else
|
||||
cmake="${CMakeCommand} ${CMakeCacheEntries} ${sourcedir}"
|
||||
fi
|
||||
|
||||
if [ "${display_cmake}" = 1 ]; then
|
||||
echo "${cmake}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -d $builddir ]; then
|
||||
# If build directory exists, check if it has a CMake cache
|
||||
if [ -f $builddir/CMakeCache.txt ]; then
|
||||
|
@ -478,19 +491,6 @@ echo "Build Directory : $builddir"
|
|||
echo "Source Directory: $sourcedir"
|
||||
cd $builddir
|
||||
|
||||
echo "Using $(cmake --version | head -1)"
|
||||
echo
|
||||
if [ -n "$CMakeGenerator" ]; then
|
||||
cmake="${CMakeCommand} -G ${CMakeGenerator} ${CMakeCacheEntries} ${sourcedir}"
|
||||
else
|
||||
cmake="${CMakeCommand} ${CMakeCacheEntries} ${sourcedir}"
|
||||
fi
|
||||
|
||||
if [ "${display_cmake}" = 1 ]; then
|
||||
echo "${cmake}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
eval ${cmake} 2>&1
|
||||
|
||||
echo "# This is the command used to configure this build" >config.status
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue