Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'cknill/topic/cknill/display_cmake_fix'

Browse source 
* cknill/topic/cknill/display_cmake_fix:
  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.
This commit is contained in:
Arne Welzel 2024-07-09 17:10:16 +02:00
commit e102715bc8
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
7.0.0-dev.447 | 2024-07-09 17:10:16 +0200
* Fix for --display-cmake in configure (cknill)
Moved build directory creation further down in the script so that --display-cmake
has a chance to happen before build tree setup.
7.0.0-dev.445 | 2024-07-09 00:07:25 -0700 7.0.0-dev.445 | 2024-07-09 00:07:25 -0700
* Management framework: bump cluster testsuite to pull in telemetry tests (Christian Kreibich, Corelight) * Management framework: bump cluster testsuite to pull in telemetry tests (Christian Kreibich, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.0.0-dev.445 7.0.0-dev.447

26
configure vendored
View file

@ -458,6 +458,19 @@ if [ -z "$CMakeCommand" ]; then
fi fi
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 [ -d $builddir ]; then
# If build directory exists, check if it has a CMake cache # If build directory exists, check if it has a CMake cache
if [ -f $builddir/CMakeCache.txt ]; then if [ -f $builddir/CMakeCache.txt ]; then
@ -474,19 +487,6 @@ echo "Build Directory : $builddir"
echo "Source Directory: $sourcedir" echo "Source Directory: $sourcedir"
cd $builddir 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 eval ${cmake} 2>&1
echo "# This is the command used to configure this build" >config.status echo "# This is the command used to configure this build" >config.status