From 2f9bb73d6f6b983ef054d00706b3b4256d2e4c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl> Date: Tue, 2 Apr 2019 09:14:21 +0000 Subject: [PATCH] SW-157: Set default compiler to gcc6 on buildhostcentos7 --- CMake/variants/variants.lcs157 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMake/variants/variants.lcs157 b/CMake/variants/variants.lcs157 index 148f76b8073..dae2235595b 100644 --- a/CMake/variants/variants.lcs157 +++ b/CMake/variants/variants.lcs157 @@ -11,3 +11,8 @@ set(BDSF_ROOT_DIR "/opt/PyBDSF/lib64/python2.7/site-packages/") set(DAL_ROOT_DIR "/opt/DAL") #set(QPID_ROOT_DIR /opt/qpid) +# Overwrite the compiler paths on CentOS7 +set(GNUCXX11_C /opt/rh/devtoolset-6/root/usr/bin/gcc) # GNU C compiler +set(GNUCXX11_CXX /opt/rh/devtoolset-6/root/usr/bin/g++) # GNU C+ compiler +set(GNUCXX11_Fortran /opt/rh/devtoolset-6/root/usr/bin/gfortran) # GNU Fortran compiler +set(GNUCXX11_ASM /opt/rh/devtoolset-6/root/usr/bin/gcc) # GNU assembler -- GitLab