From f7dc338efe1d30aad0694a9046b8bb91bd2657f5 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Wed, 27 Sep 2017 18:28:11 +0200
Subject: [PATCH] Updated the build scripts for atlasexternals and Gaudi, to:
- Make sure that the builds are properly re-configured, by explicitly
removing the CMakeCache.txt file from the build directories; - Cleaning the
build directory completely whenever the build of Gaudi is re-configured.
To provide a temporary fix for GAUDI-1315.
Former-commit-id: 73de7deda410887546af5b3add3b6d93e77c9d61
---
Build/AtlasBuildScripts/build_Gaudi.sh | 2 ++
Build/AtlasBuildScripts/build_atlasexternals.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/Build/AtlasBuildScripts/build_Gaudi.sh b/Build/AtlasBuildScripts/build_Gaudi.sh
index 9b27a23fa63..cae26318903 100755
--- a/Build/AtlasBuildScripts/build_Gaudi.sh
+++ b/Build/AtlasBuildScripts/build_Gaudi.sh
@@ -90,6 +90,8 @@ source ${EXTDIR}/setup.sh || ((ERROR_COUNT++))
# Configure the build:
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
{
+rm -f CMakeCache.txt
+rm -rf * # Remove the full build temporarily, to fix GAUDI-1315
cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
-DGAUDI_ATLAS:BOOL=TRUE -DGAUDI_ATLAS_BASE_PROJECT:STRING=${EXTPROJECT} \
-DCMAKE_INSTALL_PREFIX:PATH=/InstallArea/${PLATFORM} \
diff --git a/Build/AtlasBuildScripts/build_atlasexternals.sh b/Build/AtlasBuildScripts/build_atlasexternals.sh
index 1b0256cdda6..877f4064ec6 100755
--- a/Build/AtlasBuildScripts/build_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/build_atlasexternals.sh
@@ -85,6 +85,7 @@ fi
# Configure the build:
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
{
+ rm -f CMakeCache.txt
cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${EXTRACONF} \
${SOURCEDIR}/Projects/${PROJECT}/ || touch $error_stamp
--
GitLab