Skip to content
Snippets Groups Projects
Commit 2fb120fa authored by Martin Killenberg's avatar Martin Killenberg
Browse files

hopefully fixed strange behaviour of unset RUN_FROM_SUBDIR variable

parent ba3b50c4
No related branches found
No related tags found
No related merge requests found
......@@ -161,7 +161,12 @@ def doBuild(String label, String buildType) {
sudo -H -u msk_jenkins mkdir -p /scratch/install
cd /scratch/build-${JOB_NAME}
# We might run only part of the project from a sub-directory. If it is empty the trailing / does not confuse cmake
sudo -H -u msk_jenkins cmake /scratch/source/${env.RUN_FROM_SUBDIR} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
if [ -z "\${RUN_FROM_SUBDIR}" ]; then
SUBDIR=""
else
SUBDIR="${env.RUN_FROM_SUBDIR}"
fi
sudo -H -u msk_jenkins cmake /scratch/source/\${SUBDIR} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
sudo -H -u msk_jenkins make ${env.MAKEOPTS}
"""
}
......
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