From ad7afef16e2f6a89496b4cc49fb2c7e4440900f2 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Thu, 26 Jan 2017 07:48:50 +0000
Subject: [PATCH] TAsk #10049: Update variants.lhd002
---
CMake/variants/variants.lhd002 | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/CMake/variants/variants.lhd002 b/CMake/variants/variants.lhd002
index 73395cb2307..03c1a35cfb6 100644
--- a/CMake/variants/variants.lhd002
+++ b/CMake/variants/variants.lhd002
@@ -1,17 +1,15 @@
-option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-
-set(CASACORE_ROOT_DIR /opt/cep/casacore/builds/casacore-2.0.3/build/gnu_opt)
-set(CASAREST_ROOT_DIR /opt/cep/casarest/builds/casarest-svn8765-2.0.3)
-set(PYRAP_ROOT_DIR /opt/cep/pyrap/builds/python-casacore-2.0.0-2.0.3)
-set(WCSLIB_ROOT_DIR /opt/cep/wcslib/builds/wcslib-4.23)
+qoption(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(AOFLAGGER_ROOT_DIR /opt/cep/aoflagger/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{JAVA_HOME} /usr/lib/jvm/java-1.5.0-sun)
+set(ENV{HDF5_ROOT} )
set(CTEST_CUSTOM_WARNING_EXCEPTION
"/log4cxx/helpers/objectptr.h:[0-9]+: warning: base class"
--
GitLab