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

Configure wrapper now deletes previous CMake cache

Browse source
This commit is contained in:
Jon Siwek 2011-01-24 11:26:29 -06:00
parent 4da36217b7
commit 4817f7de4e
5 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/binpac

@ -1 +1 @@
Subproject commit be0147ae8df149206408f669ea233931e8889718 Subproject commit 668bfa183250c14056e5e7790f07f4cb2b06d275

2
aux/bro-aux

@ -1 +1 @@
Subproject commit e6fa79f8c6584476c6a50118990e9e69be41823b Subproject commit fd60602c87503124a0e1f1f886ebb9730835fd5c

2
aux/broccoli

@ -1 +1 @@
Subproject commit 05a35440b0369e5e5e74731300ceddbe78cd53e4 Subproject commit c3f26107302e6bcfc45c5681eb9d69b48fad7b62

2
aux/broctl

@ -1 +1 @@
Subproject commit 818bc09e35691f3d5c6de56481dac79d5b87db75 Subproject commit 5173da39523f6db4a087cc60d04f4fd6765f4e15

18
configure vendored
View file

@ -189,21 +189,9 @@ done
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
# If the Cmake cache exists, then check that it thinks # If the CMake cache exists, delete it so that this configuration
# the source tree exists where it's currently located # is not tainted by a previous one
cmakehomedir=`grep CMAKE_HOME_DIRECTORY $builddir/CMakeCache.txt | \ rm -f $builddir/CMakeCache.txt
sed 's/CMAKE_HOME_DIRECTORY:INTERNAL=//g'`
if [ "$cmakehomedir" != "$sourcedir" ]; then
# The source tree moved since the build was last configured
echo "\
The source tree has been moved from:
$cmakehomedir
to:
$sourcedir
To reconfigure in the new source directory, please delete:
$builddir/CMakeCache.txt" >&2
exit 1
fi
fi fi
else else
# Create build directory # Create build directory