From 3f24d6ac2604fe9ed48e1ad16946c9c4d3221870 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Mon, 29 May 2017 06:51:38 +0000
Subject: [PATCH] TAsk #10836: Fixing Jenkins builds by adding and editing
 lhd001 variants file

---
 CMake/variants/{variants.lhd002 => variants.lhd001} | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename CMake/variants/{variants.lhd002 => variants.lhd001} (54%)

diff --git a/CMake/variants/variants.lhd002 b/CMake/variants/variants.lhd001
similarity index 54%
rename from CMake/variants/variants.lhd002
rename to CMake/variants/variants.lhd001
index 249fcc768bf..564d0004991 100644
--- a/CMake/variants/variants.lhd002
+++ b/CMake/variants/variants.lhd001
@@ -1,15 +1,11 @@
 option(BUILD_SHARED_LIBS        "Build shared libraries"      ON)
 
-set(CASACORE_ROOT_DIR /opt/cep/casacore/current)
-set(CASAREST_ROOT_DIR /opt/cep/casarest/current)
-set(PYRAP_ROOT_DIR /opt/cep/pyrap/current)
-set(WCSLIB_ROOT_DIR /opt/cep/lofar/external/wcslib)
+set(CASACORE_ROOT_DIR /opt/cep/casacore/casacore_current)
+set(CASAREST_ROOT_DIR /opt/cep/casacore/casarest_current)
+set(PYRAP_ROOT_DIR /opt/cep/casacore/python-casacore_current)
 set(AOFLAGGER_ROOT_DIR /opt/cep/aoflagger/current)
 set(BDSF_ROOT_DIR /opt/cep/pybdsf/current)
 set(DAL_ROOT_DIR /opt/cep/dal/current)
-set(QPID_ROOT_DIR /opt/qpid)
-set(LOG4CXX_ROOT_DIR /opt/cep/lofar/external/log4cxx)
-set(LOG4CPLUS_ROOT_DIR /opt/cep/lofar/external/log4cplus)
 set(ENV{HDF5_ROOT} )
 
 set(CTEST_CUSTOM_WARNING_EXCEPTION
-- 
GitLab