From 775de1d2c0f408249f4b65c2bc4f28e1c71a6257 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Wed, 28 Oct 2015 15:44:08 +0000
Subject: [PATCH] TAsk #8669: Adding variants.lhd002 and adapting
variants.lhn001
---
CMake/variants/variants.lhd002 | 19 +++++++++++++++++++
CMake/variants/variants.lhn001 | 4 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 CMake/variants/variants.lhd002
diff --git a/CMake/variants/variants.lhd002 b/CMake/variants/variants.lhd002
new file mode 100644
index 00000000000..f1c26c4b830
--- /dev/null
+++ b/CMake/variants/variants.lhd002
@@ -0,0 +1,19 @@
+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)
+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)
+
+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(CTEST_CUSTOM_WARNING_EXCEPTION
+ "/log4cxx/helpers/objectptr.h:[0-9]+: warning: base class"
+ "/log4cxx/helpers/objectptr.h:[0-9]+: warning: dereferencing type-punned pointer"
+)
diff --git a/CMake/variants/variants.lhn001 b/CMake/variants/variants.lhn001
index 845364d5517..f1c26c4b830 100644
--- a/CMake/variants/variants.lhn001
+++ b/CMake/variants/variants.lhn001
@@ -1,8 +1,8 @@
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-set(CASACORE_ROOT_DIR /opt/cep/casacore/builds/casacore-2.0.1/build/gnu_opt)
+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)
-set(PYRAP_ROOT_DIR /opt/cep/pyrap/builds/python-casacore-2.0.0)
+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)
set(DAL_ROOT_DIR /opt/cep/dal/current)
--
GitLab