Skip to content
Snippets Groups Projects
Commit 146adacf authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Add wrapper for software collections

The TSC decided to move to devtoolset-7 on rhel7 to allow for C++14
standard code in mantid.
parent 66ed1d80
No related branches found
No related tags found
No related merge requests found
...@@ -66,6 +66,13 @@ else ...@@ -66,6 +66,13 @@ else
BUILD_CONFIG="Release" BUILD_CONFIG="Release"
fi fi
# Setup software collections on rhel7 to allow using gcc7
if [[ $ON_RHEL7 ]]; then
SCL_ENABLE="scl enable devtoolset-7"
else
SCL_ENABLE="eval"
fi
# For pull requests decide on what to build based on changeset and Jenkins # For pull requests decide on what to build based on changeset and Jenkins
# parameters. # parameters.
DO_BUILD_CODE=true DO_BUILD_CODE=true
...@@ -270,7 +277,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz ...@@ -270,7 +277,7 @@ rm -f -- *.dmg *.rpm *.deb *.tar.gz *.tar.xz
############################################################################### ###############################################################################
# CMake configuration # CMake configuration
############################################################################### ###############################################################################
${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=${PARAVIEW_DIR} -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DENABLE_WORKBENCH=ON -DENABLE_FILE_LOGGING=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} .. $SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DMAKE_VATES=ON -DParaView_DIR=${PARAVIEW_DIR} -DMANTID_DATA_STORE=${MANTID_DATA_STORE} -DDOCS_HTML=ON -DENABLE_CONDA=ON -DENABLE_WORKBENCH=ON -DENABLE_FILE_LOGGING=OFF ${DIST_FLAGS} ${PACKAGINGVARS} ${CLANGTIDYVAR} .."
############################################################################### ###############################################################################
# Coverity build should exit early # Coverity build should exit early
......
...@@ -86,7 +86,17 @@ fi ...@@ -86,7 +86,17 @@ fi
# Need this because some strange control sequences when using default TERM=xterm # Need this because some strange control sequences when using default TERM=xterm
export TERM="linux" export TERM="linux"
PYLINT_FORMAT="parseable" PYLINT_FORMAT="parseable"
${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=OFF -DMAKE_VATES=OFF -DPYLINT_MSG_TEMPLATE=\"${PYLINT_FORMAT}\" -DPYLINT_NTHREADS=${BUILD_THREADS:?} -DPYLINT_OUTPUT_DIR=${PYLINT_OUTPUT_DIR} ..
###############################################################################
# Configure cmake
###############################################################################
# Setup software collections on rhel7 to allow using gcc7
if [[ ${NODE_LABELS} == *rhel7* ]] || [[ ${NODE_LABELS} == *centos7* ]] || [[ ${NODE_LABELS} == *scilin7* ]]; then
SCL_ENABLE="scl enable devtoolset-7"
else
SCL_ENABLE="eval"
fi
$SCL_ENABLE "${CMAKE_EXE} ${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=OFF -DMAKE_VATES=OFF -DPYLINT_MSG_TEMPLATE=\"${PYLINT_FORMAT}\" -DPYLINT_NTHREADS=${BUILD_THREADS:?} -DPYLINT_OUTPUT_DIR=${PYLINT_OUTPUT_DIR} .."
############################################################################### ###############################################################################
# Build step (we only need the framework) # Build step (we only need the framework)
......
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