From 3e6c836fe39db60cb9dfadcd435acd8c90e5cded Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <dijkema@astron.nl>
Date: Fri, 17 Mar 2017 15:19:20 +0000
Subject: [PATCH] Task #10504: option is BDSF_ROOT_DIR, not PYBDSF_ROOT_DIR
---
CMake/variants/variants.lhd002 | 2 +-
Docker/lofar-pipeline/Dockerfile.tmpl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMake/variants/variants.lhd002 b/CMake/variants/variants.lhd002
index e6be13356a4..249fcc768bf 100644
--- a/CMake/variants/variants.lhd002
+++ b/CMake/variants/variants.lhd002
@@ -5,7 +5,7 @@ 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(PYBDSF_ROOT_DIR /opt/cep/pybdsf/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)
diff --git a/Docker/lofar-pipeline/Dockerfile.tmpl b/Docker/lofar-pipeline/Dockerfile.tmpl
index e478cfe6048..59b8c2ab21b 100644
--- a/Docker/lofar-pipeline/Dockerfile.tmpl
+++ b/Docker/lofar-pipeline/Dockerfile.tmpl
@@ -65,7 +65,7 @@ RUN apt-get update && apt-get install -y subversion cmake g++ gfortran bison fle
cd ${INSTALLDIR}/lofar && \
svn --non-interactive -q co -r ${LOFAR_REVISION} -N ${LOFAR_BRANCH_URL} src; \
svn --non-interactive -q up src/CMake && \
- cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && cmake -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DCASAREST_ROOT_DIR=${INSTALLDIR}/casarest/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DPYBDSF_ROOT_DIR=/opt/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=/opt/qpid/ -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
+ cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && cmake -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DCASAREST_ROOT_DIR=${INSTALLDIR}/casarest/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DBDSF_ROOT_DIR=/opt/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=/opt/qpid/ -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && sed -i '29,31d' include/ApplCommon/PosixTime.h && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && make -j ${J} && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && make install && \
--
GitLab