Skip to content
Snippets Groups Projects
Commit f7dc338e authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

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: 73de7ded
parent 3bb8403e
No related branches found
No related tags found
No related merge requests found
...@@ -90,6 +90,8 @@ source ${EXTDIR}/setup.sh || ((ERROR_COUNT++)) ...@@ -90,6 +90,8 @@ source ${EXTDIR}/setup.sh || ((ERROR_COUNT++))
# Configure the build: # Configure the build:
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp 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 \ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
-DGAUDI_ATLAS:BOOL=TRUE -DGAUDI_ATLAS_BASE_PROJECT:STRING=${EXTPROJECT} \ -DGAUDI_ATLAS:BOOL=TRUE -DGAUDI_ATLAS_BASE_PROJECT:STRING=${EXTPROJECT} \
-DCMAKE_INSTALL_PREFIX:PATH=/InstallArea/${PLATFORM} \ -DCMAKE_INSTALL_PREFIX:PATH=/InstallArea/${PLATFORM} \
......
...@@ -85,6 +85,7 @@ fi ...@@ -85,6 +85,7 @@ fi
# Configure the build: # Configure the build:
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp 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 \ cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
${EXTRACONF} \ ${EXTRACONF} \
${SOURCEDIR}/Projects/${PROJECT}/ || touch $error_stamp ${SOURCEDIR}/Projects/${PROJECT}/ || touch $error_stamp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment