diff --git a/build_lofar.sh b/build_lofar.sh
index 38388be422e37ee90090f65d506790c20d757c72..d8fe9c3f7039f72979df3e4fc79142adfec907a9 100644
--- a/build_lofar.sh
+++ b/build_lofar.sh
@@ -557,9 +557,11 @@ if [ ! -e $prefix/.done ]; then
mkdir presrc &&
mv wsclean-${wsclean_version} presrc/wsclean
else
- git clone git://git.code.sf.net/p/wsclean/code presrc &&
- mv presrc src
- fi
+ git clone git://git.code.sf.net/p/wsclean/code presrc
+ fi &&
+ echo "Patching build (for BLAS, Boost, Python, usually) ..." &&
+ (cd presrc && patch -Np1 < "$scriptdir/$pkg-buildfix.patch" ) &&
+ mv presrc src
fi &&
mkdir build &&
cd build &&
diff --git a/dysco-buildfix.patch b/dysco-buildfix.patch
index ca8cfef69be73c2c82842197e0e518078da72c0e..7fd69942fe7970dd084af9c60aa7b4f1738ec826 100644
--- a/dysco-buildfix.patch
+++ b/dysco-buildfix.patch
@@ -1,3 +1,39 @@
+diff --git a/CMake/FindCasacore.cmake b/CMake/FindCasacore.cmake
+index e4689f7..9068fdd 100644
+--- a/CMake/FindCasacore.cmake
++++ b/CMake/FindCasacore.cmake
+@@ -17,6 +17,8 @@
+ #
+ # Variables used by this module:
+ # CASACORE_ROOT_DIR - Casacore root directory.
++# BLAS_LIBS - override BLAS library
++# LAPACK_LIBS - override LAPACK library
+ #
+ # Variables defined by this module:
+ # CASACORE_FOUND - System has Casacore, which means that the
+@@ -232,7 +234,21 @@ else(NOT CASACORE_INCLUDE_DIR)
+ elseif(${_comp} STREQUAL fits)
+ casacore_find_package(CFITSIO REQUIRED)
+ elseif(${_comp} STREQUAL scimath_f)
+- casacore_find_package(LAPACK REQUIRED)
++ # If only looking for LAPACK, no library will be added if LAPACK
++ # is part of BLAS, as it is customary nowadays. So look for both
++ # to avoid confusing linker errors on symbols used in headers/templates.
++ if(DEFINED ENV{BLAS_LIBS})
++ set(BLAS_FOUND YES)
++ list(APPEND CASACORE_LIBRARIES $ENV{BLAS_LIBS})
++ else()
++ casacore_find_package(BLAS REQUIRED)
++ endif()
++ if(DEFINED ENV{LAPACK_LIBS})
++ set(LAPACK_FOUND YES)
++ list(APPEND CASACORE_LIBRARIES $ENV{LAPACK_LIBS})
++ else()
++ casacore_find_package(LAPACK REQUIRED)
++ endif()
+ endif(${_comp} STREQUAL casa)
+ endforeach(_comp ${_find_components})
+ endif(NOT CASACORE_INCLUDE_DIR)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35bc9e8..d9bdd1b 100644
--- a/CMakeLists.txt
diff --git a/pyBDSF-env.sh b/pyBDSF-env.sh
deleted file mode 100644
index d7ba2d9649f050e07323f3ccd6606857e3525cfc..0000000000000000000000000000000000000000
--- a/pyBDSF-env.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-cd /dev/shm/thor-lofar/pyBDSF/src
-declare -x AOFLAGGER_VERSION="v2.14.0"
-declare -x BOOST_DOT_VERSION="1.67.0"
-declare -x BOOST_VERSION="1_67_0"
-declare -x CASACORE_VERSION="latest"
-declare -x CC="/sw/compiler/gcc-8.3.0/bin/gcc"
-declare -x CFITSIO_VERSION="3.47"
-declare -x CFLAGS="-march=native -O3 -fno-math-errno -ftree-vectorize"
-declare -x CPATH="/dev/shm/thor-lofar//DP3/include:/dev/shm/thor-lofar//aoflagger/include:/dev/shm/thor-lofar//LOFARBeam/include:/dev/shm/thor-lofar//idg/include:/dev/shm/thor-lofar//casacore/include:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/include:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/include:/sw/compiler/gcc-8.3.0/include:/sw/compiler/cuda-10.2.89/include"
-declare -x CPATH_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/include:1:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/include:1:/sw/compiler/gcc-8.3.0/include:1:/sw/compiler/cuda-10.2.89/include:1"
-declare -x CUDA_DIR="/sw/compiler/cuda-10.2.89"
-declare -x CUDA_HOME="/sw/compiler/cuda-10.2.89"
-declare -x CUDA_PATH="/sw/compiler/cuda-10.2.89"
-declare -x CXX="/sw/compiler/gcc-8.3.0/bin/g++"
-declare -x CXXFLAGS="-D_GLIB_USE_CXX_ABI=1 -DBOOST_NO_CXX11_SCOPED_ENUMS -march=native -O3 -fno-math-errno -ftree-vectorize"
-declare -x C_INCLUDE_PATH_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/include:1:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/include:1:/sw/compiler/gcc-8.3.0/include:1:/sw/compiler/cuda-10.2.89/include:1"
-declare -x DYSCO_VERSION="v1.2.0"
-declare -x FC="/sw/compiler/gcc-8.3.0/bin/gfortran"
-declare -x FCFLAGS="-march=native -O3 -fno-math-errno -ftree-vectorize"
-declare -x FFTW_VERSION="3.3.8"
-declare -x HDF5_VERSION="1.8.21"
-declare -x HOME="/home/rznv039"
-declare -x INCLUDE_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/include:1"
-declare -x INFOPATH="/sw/compiler/gcc-8.3.0/share/info:/usr/share/info"
-declare -x INFOPATH_modshare="/sw/compiler/gcc-8.3.0/share/info:1:/usr/share/info:1"
-declare -x J="64"
-declare -x LANG="en_US.UTF-8"
-declare -x LANGUAGE="en_US:en"
-declare -x LC_ADDRESS="de_DE.UTF-8"
-declare -x LC_IDENTIFICATION="de_DE.UTF-8"
-declare -x LC_MEASUREMENT="de_DE.UTF-8"
-declare -x LC_MONETARY="de_DE.UTF-8"
-declare -x LC_NAME="de_DE.UTF-8"
-declare -x LC_NUMERIC="de_DE.UTF-8"
-declare -x LC_PAPER="de_DE.UTF-8"
-declare -x LC_TELEPHONE="de_DE.UTF-8"
-declare -x LC_TIME="de_DE.UTF-8"
-declare -x LDFLAGS="-lgsl -lcblas -lopenblas_openmp -Wl,--as-needed"
-declare -x LD_RUN_PATH="/dev/shm/thor-lofar//DP3/lib:/dev/shm/thor-lofar//aoflagger/lib:/dev/shm/thor-lofar//LOFARBeam/lib:/dev/shm/thor-lofar//idg/lib:/dev/shm/thor-lofar//casacore/lib:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib/openmpi:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib:/sw/compiler/gcc-8.3.0/lib64:/sw/compiler/gcc-8.3.0/lib:/sw/compiler/cuda-10.2.89/lib64"
-declare -x LD_RUN_PATH_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib:1:/sw/compiler/cuda-10.2.89/lib64:1:/sw/compiler/gcc-8.3.0/lib:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib:1:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib/openmpi:1:/sw/compiler/gcc-8.3.0/lib64:1"
-declare -x LESSCLOSE="/usr/bin/lesspipe %s %s"
-declare -x LESSOPEN="| /usr/bin/lesspipe %s"
-declare -x LIBRARY_PATH="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib:/sw/compiler/gcc-8.3.0/lib64:/sw/compiler/gcc-8.3.0/lib:/sw/compiler/cuda-10.2.89/lib64"
-declare -x LIBRARY_PATH_modshare="/sw/compiler/cuda-10.2.89/lib64:1:/sw/compiler/gcc-8.3.0/lib:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib:1:/sw/compiler/gcc-8.3.0/lib64:1"
-declare -x LOADEDMODULES="site/lgc:/sw/CORE/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4:env/2019Q4-cuda-gcc-openmpi:pythonversion/3"
-declare -x LOADEDMODULES_modshare="/sw/CORE/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4:1:pythonversion/3:1:env/2019Q4-cuda-gcc-openmpi:1:site/lgc:1"
-declare -x LOGNAME="rznv039"
-declare -x LS_COLORS="rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:"
-declare -x MAIL="/var/mail/rznv039"
-declare -x MANPATH="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/man:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/gnu/man:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/share/man:/sw/compiler/gcc-8.3.0/share/man:/sw/compiler/cuda-10.2.89/doc/man:/sw/rrz/share/man:/sw/modules/man:/usr/share/man"
-declare -x MANPATH_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/man:1:/sw/compiler/gcc-8.3.0/share/man:1:/sw/compiler/cuda-10.2.89/doc/man:1:/sw/modules/man:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/gnu/man:1:/usr/share/man:1:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/share/man:1:/sw/rrz/share/man:1"
-declare -x MODULEPATH="/sw/LIB/2019Q4-cuda-gcc-openmpi:/home/software/modulefiles/DEVELOPMENT:/home/software/modulefiles/TOOLS:/sw/BASE:/sw/TOOL:/sw/APP"
-declare -x MODULEPATH_modshare="/sw/LIB/2019Q4-cuda-gcc-openmpi:1:/home/software/modulefiles/DEVELOPMENT:1:/sw/APP:1:/home/software/modulefiles/TOOLS:1:/sw/TOOL:1:/sw/BASE:1"
-declare -x MODULESHOME="/sw/modules/tcl"
-declare -x OLDPWD="/dev/shm/thor-lofar/pyBDSF"
-declare -x PATH="/dev/shm/thor-lofar//DP3/bin:/dev/shm/thor-lofar//aoflagger/bin:/dev/shm/thor-lofar//LOFARBeam/bin:/dev/shm/thor-lofar//idg/bin:/dev/shm/thor-lofar//casacore/bin:/sw/link/python3/bin:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/bin:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/gnu/bin:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/bin:/sw/compiler/gcc-8.3.0/bin:/sw/compiler/cuda-10.2.89/bin:/home/rznv039/bin:/sw/rrz/bin:/sw/tools/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
-declare -x PATH_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/bin:1:/usr/bin:1:/sw/link/python3/bin:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/gnu/bin:1:/sw/compiler/gcc-8.3.0/bin:1:/usr/local/bin:1:/home/rznv039/bin:999999999:/bin:1:/sw/tools/bin:1:/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/bin:1:/sbin:1:/sw/compiler/cuda-10.2.89/bin:1:/usr/sbin:1:/usr/games:1:/sw/rrz/bin:1:/usr/local/sbin:1:/usr/local/cuda/bin:1:/usr/local/games:1"
-declare -x PERL5LIB="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib/perl/site_perl"
-declare -x PERL5LIB_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib/perl/site_perl:1"
-declare -x PKG_CONFIG_PATH="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/share/pkgconfig:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib/pkgconfig:/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig"
-declare -x PKG_CONFIG_PATH_modshare="/usr/lib/x86_64-linux-gnu/pkgconfig:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/share/pkgconfig:1:/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib/pkgconfig:1:/usr/share/pkgconfig:1:/usr/lib/pkgconfig:1:/lib/x86_64-linux-gnu/pkgconfig:1"
-declare -x PWD="/dev/shm/thor-lofar/pyBDSF/src"
-declare -x PYBDSF_VERSION="v1.8.12"
-declare -x PYTHONPATH="/dev/shm/thor-lofar//pyBDSF/lib/python3.6/site-packages:/dev/shm/thor-lofar//python-casacore/lib/python3.6/site-packages:"
-declare -x PYTHON_CASACORE_VERSION="3.1.1"
-declare -x QT_QPA_PLATFORMTHEME="appmenu-qt5"
-declare -x RRZ_LOCAL_TMPDIR="/tmp/rznv039"
-declare -x RRZ_PKG_PREFIX="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4"
-declare -x RRZ_SW_BINPREFIX="/sw"
-declare -x RRZ_SW_INIT="1"
-declare -x RRZ_SW_PREFIX="/sw"
-declare -x RRZ_TMPDIR="/tmp"
-declare -x SHELL="/bin/bash"
-declare -x SHLVL="2"
-declare -x SSH_CLIENT="192.168.79.62 50140 22"
-declare -x SSH_CONNECTION="192.168.79.62 50140 192.168.79.35 22"
-declare -x SSH_TTY="/dev/pts/3"
-declare -x TERM="screen.xterm-256color"
-declare -x TMPDIR="/tmp"
-declare -x USER="rznv039"
-declare -x WCSLIB_VERSION="latest"
-declare -x WSCLEAN_VERSION="latest"
-declare -x XDG_CONFIG_DIRS="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/etc/xdg"
-declare -x XDG_CONFIG_DIRS_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/etc/xdg:1"
-declare -x XDG_DATA_DIRS="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/share"
-declare -x XDG_DATA_DIRS_modshare="/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/share:1"
-declare -x XDG_RUNTIME_DIR="/run/user/6783"
-declare -x XDG_SESSION_ID="28620"
-declare -x _LMFILES_="/sw/BASE/site/lgc:/sw/CORE/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4:/sw/BASE/env/2019Q4-cuda-gcc-openmpi:/sw/TOOL/pythonversion/3"
-declare -x _LMFILES__modshare="/sw/BASE/env/2019Q4-cuda-gcc-openmpi:1:/sw/BASE/site/lgc:1:/sw/CORE/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4:1:/sw/TOOL/pythonversion/3:1"
-export LDFLAGS='-L/dev/shm/thor-lofar//DP3/lib -Wl,-R/dev/shm/thor-lofar//DP3/lib -L/dev/shm/thor-lofar//aoflagger/lib -Wl,-R/dev/shm/thor-lofar//aoflagger/lib -L/dev/shm/thor-lofar//LOFARBeam/lib -Wl,-R/dev/shm/thor-lofar//LOFARBeam/lib -L/dev/shm/thor-lofar//idg/lib -Wl,-R/dev/shm/thor-lofar//idg/lib -L/dev/shm/thor-lofar//casacore/lib -Wl,-R/dev/shm/thor-lofar//casacore/lib -L/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib -Wl,-R/sw/env/cuda-10.2.89_gcc-8.3.0_openmpi-4.0.2/pkgsrc/2019Q4/lib -L/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib/openmpi -Wl,-R/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib/openmpi -L/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib -Wl,-R/sw/env/cuda-10.2.89_gcc-8.3.0/openmpi/4.0.2/lib -L/sw/compiler/gcc-8.3.0/lib64 -Wl,-R/sw/compiler/gcc-8.3.0/lib64 -L/sw/compiler/gcc-8.3.0/lib -Wl,-R/sw/compiler/gcc-8.3.0/lib -L/sw/compiler/cuda-10.2.89/lib64 -Wl,-R/sw/compiler/cuda-10.2.89/lib64 -lgsl -lcblas -lopenblas_openmp -Wl,--as-needed'
-export NPY_DISTUTILS_APPEND_FLAGS=1
-echo run: python setup.py install --prefix=/dev/shm/thor-lofar//pyBDSF
diff --git a/wsclean-buildfix.patch b/wsclean-buildfix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d1d1470ca1d81db0d63bf3492586a29892903ef8
--- /dev/null
+++ b/wsclean-buildfix.patch
@@ -0,0 +1,54 @@
+diff --git a/wsclean/CMake/FindCasacore.cmake b/wsclean/CMake/FindCasacore.cmake
+index e4689f7..9068fdd 100644
+--- a/wsclean/CMake/FindCasacore.cmake
++++ b/wsclean/CMake/FindCasacore.cmake
+@@ -17,6 +17,8 @@
+ #
+ # Variables used by this module:
+ # CASACORE_ROOT_DIR - Casacore root directory.
++# BLAS_LIBS - override BLAS library
++# LAPACK_LIBS - override LAPACK library
+ #
+ # Variables defined by this module:
+ # CASACORE_FOUND - System has Casacore, which means that the
+@@ -232,7 +234,21 @@ else(NOT CASACORE_INCLUDE_DIR)
+ elseif(${_comp} STREQUAL fits)
+ casacore_find_package(CFITSIO REQUIRED)
+ elseif(${_comp} STREQUAL scimath_f)
+- casacore_find_package(LAPACK REQUIRED)
++ # If only looking for LAPACK, no library will be added if LAPACK
++ # is part of BLAS, as it is customary nowadays. So look for both
++ # to avoid confusing linker errors on symbols used in headers/templates.
++ if(DEFINED ENV{BLAS_LIBS})
++ set(BLAS_FOUND YES)
++ list(APPEND CASACORE_LIBRARIES $ENV{BLAS_LIBS})
++ else()
++ casacore_find_package(BLAS REQUIRED)
++ endif()
++ if(DEFINED ENV{LAPACK_LIBS})
++ set(LAPACK_FOUND YES)
++ list(APPEND CASACORE_LIBRARIES $ENV{LAPACK_LIBS})
++ else()
++ casacore_find_package(LAPACK REQUIRED)
++ endif()
+ endif(${_comp} STREQUAL casa)
+ endforeach(_comp ${_find_components})
+ endif(NOT CASACORE_INCLUDE_DIR)
+diff --git a/wsclean/CMakeLists.txt b/wsclean/CMakeLists.txt
+index be767e2..a45046a 100644
+--- a/wsclean/CMakeLists.txt
++++ b/wsclean/CMakeLists.txt
+@@ -38,7 +38,12 @@ find_library(PTHREAD_LIB pthread REQUIRED)
+ find_library(DL_LIB dl REQUIRED)
+ find_library(GSL_LIB NAMES gsl)
+ find_path(GSL_INCLUDE_DIR NAMES gsl/gsl_version.h)
+-find_library(GSL_CBLAS_LIB NAMES gslcblas)
++if(DEFINED ENV{CBLAS_LIBS})
++ message(STATUS "Using CBLAS_LIBS from environment: $ENV{CBLAS_LIBS}")
++ set(GSL_CBLAS_LIB $ENV{CBLAS_LIBS})
++else()
++ find_library(GSL_CBLAS_LIB NAMES gslcblas)
++endif()
+
+ find_path(LOFAR_STATION_RESPONSE_INCLUDE_DIR NAMES StationResponse/ITRFConverter.h)
+ find_library(LOFAR_STATION_RESPONSE_LIB stationresponse)