diff --git a/CHANGES b/CHANGES index b5dcc83f67..3ff98b7558 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Management framework: bump cluster testsuite to pull in telemetry tests (Christian Kreibich, Corelight) diff --git a/VERSION b/VERSION index 9096d6183f..736ce8d128 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.0-dev.445 +7.0.0-dev.447 diff --git a/configure b/configure index 40f052a220..b365b7dd2a 100755 --- a/configure +++ b/configure @@ -458,6 +458,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 @@ -474,19 +487,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