From 09c896cf7c1a351458c621d54a5adc1a3edea79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl> Date: Tue, 16 Apr 2019 13:30:44 +0000 Subject: [PATCH] SW-663: Add a variants file for bob/dop442 which is the beefier build host. --- .gitattributes | 2 ++ CMake/variants/variants.bob | 1 + CMake/variants/variants.dop442 | 15 +++++++++++++++ 3 files changed, 18 insertions(+) create mode 120000 CMake/variants/variants.bob create mode 100644 CMake/variants/variants.dop442 diff --git a/.gitattributes b/.gitattributes index 3cab1de293a..f224bf04762 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1257,6 +1257,7 @@ CMake/testscripts/default.debug -text CMake/testscripts/timeout -text CMake/variants/GNUCXX11_2018.cmake -text CMake/variants/GNUCXX98.cmake -text +CMake/variants/variants.bob -text CMake/variants/variants.buildhostcentos7 -text CMake/variants/variants.buildhostcentos7test -text CMake/variants/variants.cbt001 -text @@ -1271,6 +1272,7 @@ CMake/variants/variants.cbt009 -text CMake/variants/variants.cbt010 -text CMake/variants/variants.dop282 -text CMake/variants/variants.dop320 -text +CMake/variants/variants.dop442 -text CMake/variants/variants.dragproc -text CMake/variants/variants.fs5 -text CMake/variants/variants.head01 -text diff --git a/CMake/variants/variants.bob b/CMake/variants/variants.bob new file mode 120000 index 00000000000..525eda38a67 --- /dev/null +++ b/CMake/variants/variants.bob @@ -0,0 +1 @@ +variants.dop442 \ No newline at end of file diff --git a/CMake/variants/variants.dop442 b/CMake/variants/variants.dop442 new file mode 100644 index 00000000000..306b7216a82 --- /dev/null +++ b/CMake/variants/variants.dop442 @@ -0,0 +1,15 @@ +set(WINCC_ROOT_DIR "/opt/WinCC_OA/3.14") +set(CASACORE_ROOT_DIR "/data/work/installed/casacore") +set(CASAREST_ROOT_DIR "/data/work/installed/casarest") +set(PYRAP_ROOT_DIR "/data/work/installed/pyrap") +set(AOFLAGGER_ROOT_DIR "/data/work/installed/aoflagger") +set(BDSF_ROOT_DIR "/data/work/installed/pybdsf/lib64/python3.6/site-packages/") +set(DAL_ROOT_DIR "/data/work/installed/DAL") +set(QPID_ROOT_DIR "/data/work/installed/qpid") + +# Overwrite the compiler paths on CentOS7 for gcc6 +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