diff --git a/.gitattributes b/.gitattributes
index 4541a261e895d559530e5e6e606d245e7f7e2658..cff4787c6d6a3ec031c81a5f807c0cc558563bec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -694,6 +694,7 @@ CEP/Pipeline/docs/sphinx/source/user/usage/tasks.rst -text
CEP/Pipeline/mac/src/Echo_Protocol.prot -text
CEP/Pipeline/mac/test/Observation6129 -text
CMake/FindAskapSoft.cmake -text
+CMake/FindCasarest.cmake -text
CMake/FindJNI.cmake -text
CMake/FindValgrind.cmake -text
CMake/TODO -text
diff --git a/CMake/FindCasarest.cmake b/CMake/FindCasarest.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..f79dc1671dc08ce2ef4d029d6d08d61fbbf7794c
--- /dev/null
+++ b/CMake/FindCasarest.cmake
@@ -0,0 +1,204 @@
+# - Try to find Casarest include dirs and libraries
+# Usage:
+# find_package(Casarest [REQUIRED] [COMPONENTS components...])
+# Valid components are:
+# msvis, calibration, synthesis, flagging, simulators
+#
+# Note that most components are dependent on other (more basic) components.
+# In that case, it suffices to specify the "top-level" components; dependent
+# components will be searched for automatically.
+#
+# Variables used by this module:
+# CASAREST_ROOT_DIR - Casarest root directory.
+#
+# Variables defined by this module:
+# CASAREST_FOUND - System has Casarest, which means that the
+# include dir was found, as well as all
+# libraries specified (not cached)
+# CASAREST_INCLUDE_DIR - Casarest include directory (cached)
+# CASAREST_INCLUDE_DIRS - Casarest include directories (not cached)
+# identical to CASAREST_INCLUDE_DIR
+# CASAREST_LIBRARIES - The Casarest libraries (not cached)
+# CASA_${COMPONENT}_LIBRARY - The absolute path of Casarest library
+# "component" (cached)
+# HAVE_CASAREST - True if system has Casarest (cached)
+# identical to CASAREST_FOUND
+#
+# ATTENTION: The component names need to be in lower case, just as the
+# casarest library names. However, the CMake variables use all upper case.
+
+# Copyright (C) 2009
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id: FindCasarest.cmake 15228 2010-03-16 09:27:26Z loose $
+
+# - casarest_resolve_dependencies(_result)
+#
+# Resolve the Casarest library dependencies for the given components.
+# The list of dependent libraries will be returned in the variable result.
+# It is sorted from least dependent to most dependent library, so it can be
+# directly fed to the linker.
+#
+# Usage: casarest_resolve_dependencies(result components...)
+#
+macro(casarest_resolve_dependencies _result)
+ set(${_result} ${ARGN})
+ set(_index 0)
+ # Do a breadth-first search through the dependency graph; append to the
+ # result list the dependent components for each item in that list.
+ # Duplicates will be removed later.
+ while(1)
+ list(LENGTH ${_result} _length)
+ if(NOT _index LESS _length)
+ break()
+ endif(NOT _index LESS _length)
+ list(GET ${_result} ${_index} item)
+ list(APPEND ${_result} ${Casarest_${item}_DEPENDENCIES})
+ math(EXPR _index "${_index}+1")
+ endwhile(1)
+ # Remove all duplicates in the current result list, while retaining only the
+ # last of each duplicate.
+ list(REVERSE ${_result})
+ list(REMOVE_DUPLICATES ${_result})
+ list(REVERSE ${_result})
+endmacro(casarest_resolve_dependencies _result)
+
+
+# - casarest_find_library(_name)
+#
+# Search for the library ${_name}.
+# If library is found, add it to CASAREST_LIBRARIES; if not, add ${_name}
+# to CASAREST_MISSING_COMPONENTS and set CASAREST_FOUND to false.
+#
+# Usage: casarest_find_library(name)
+#
+macro(casarest_find_library _name)
+ string(TOUPPER ${_name} _NAME)
+ find_library(${_NAME}_LIBRARY ${_name}
+ HINTS ${CASAREST_ROOT_DIR} PATH_SUFFIXES lib)
+ mark_as_advanced(${_NAME}_LIBRARY)
+ if(${_NAME}_LIBRARY)
+ list(APPEND CASAREST_LIBRARIES ${${_NAME}_LIBRARY})
+ else(${_NAME}_LIBRARY)
+ set(CASAREST_FOUND FALSE)
+ list(APPEND CASAREST_MISSING_COMPONENTS ${_name})
+ endif(${_NAME}_LIBRARY)
+endmacro(casarest_find_library _name)
+
+
+# - casarest_find_package(_name)
+#
+# Search for the package ${_name}.
+# If the package is found, add the contents of ${_name}_INCLUDE_DIRS to
+# CASAREST_INCLUDE_DIRS and ${_name}_LIBRARIES to CASAREST_LIBRARIES.
+#
+# If Casarest itself is required, then, strictly speaking, the packages it
+# requires must be present. However, when linking against static libraries
+# they may not be needed. One can override the REQUIRED setting by switching
+# CASAREST_MAKE_REQUIRED_EXTERNALS_OPTIONAL to ON. Beware that this might cause
+# compile and/or link errors.
+#
+# Usage: casarest_find_package(name [REQUIRED])
+#
+macro(casarest_find_package _name)
+ if("${ARGN}" MATCHES "^REQUIRED$" AND
+ Casarest_FIND_REQUIRED AND
+ NOT CASAREST_MAKE_REQUIRED_EXTERNALS_OPTIONAL)
+ find_package(${_name} REQUIRED)
+ else()
+ find_package(${_name})
+ endif()
+ if(${_name}_FOUND)
+ list(APPEND CASAREST_INCLUDE_DIRS ${${_name}_INCLUDE_DIRS})
+ list(APPEND CASAREST_LIBRARIES ${${_name}_LIBRARIES})
+ endif(${_name}_FOUND)
+endmacro(casarest_find_package _name)
+
+
+# Define the Casarest components.
+set(Casarest_components
+ msvis
+ calibration
+ synthesis
+ flagging
+ simulators
+)
+
+# Define the Casarest components' inter-dependencies.
+set(Casarest_calibration_DEPENDENCIES msvis)
+set(Casarest_synthesis_DEPENDENCIES calibration)
+set(Casarest_flagging_DEPENDENCIES msvis)
+
+# Initialize variables.
+set(CASAREST_FOUND FALSE)
+set(CASAREST_DEFINITIONS)
+set(CASAREST_LIBRARIES)
+set(CASAREST_MISSING_COMPONENTS)
+
+# Search for the header file first. Note that casarest installs the header
+# files in ${prefix}/include/casarest, instead of ${prefix}/include.
+if(NOT CASAREST_INCLUDE_DIR)
+ find_path(CASAREST_INCLUDE_DIR msvis/MSVis/VisSet.h
+ HINTS ${CASAREST_ROOT_DIR} PATH_SUFFIXES include/casarest)
+ mark_as_advanced(CASAREST_INCLUDE_DIR)
+endif(NOT CASAREST_INCLUDE_DIR)
+
+if(NOT CASAREST_INCLUDE_DIR)
+ set(CASAREST_ERROR_MESSAGE "Casarest: unable to find the header file msvis/MSVis/VisSet.h.\nPlease set CASAREST_ROOT_DIR to the root directory containing Casarest.")
+else(NOT CASAREST_INCLUDE_DIR)
+ # We've found the header file; let's continue.
+ set(CASAREST_FOUND TRUE)
+ set(CASAREST_INCLUDE_DIRS ${CASAREST_INCLUDE_DIR})
+
+ # If the user specified components explicity, use that list; otherwise we'll
+ # assume that the user wants to use all components.
+ if(NOT Casarest_FIND_COMPONENTS)
+ set(Casarest_FIND_COMPONENTS ${Casarest_components})
+ endif(NOT Casarest_FIND_COMPONENTS)
+
+ # Get a list of all dependent Casarest libraries that need to be found.
+ casarest_resolve_dependencies(_find_components ${Casarest_FIND_COMPONENTS})
+
+endif(NOT CASAREST_INCLUDE_DIR)
+
+# Set HAVE_CASAREST
+if(CASAREST_FOUND)
+ set(HAVE_CASAREST TRUE CACHE INTERNAL "Define if Casarest is installed")
+endif(CASAREST_FOUND)
+
+# Compose diagnostic message if not all necessary components were found.
+if(CASAREST_MISSING_COMPONENTS)
+ set(CASAREST_ERROR_MESSAGE "Casarest: the following components could not be found:\n ${CASAREST_MISSING_COMPONENTS}")
+endif(CASAREST_MISSING_COMPONENTS)
+
+# Print diagnostics.
+if(CASAREST_FOUND)
+ if(NOT Casarest_FIND_QUIETLY)
+ message(STATUS "Found the following Casarest components: ")
+ foreach(comp ${_find_components})
+ message(STATUS " ${comp}")
+ endforeach(comp ${_find_components})
+ endif(NOT Casarest_FIND_QUIETLY)
+else(CASAREST_FOUND)
+ if(Casarest_FIND_REQUIRED)
+ message(FATAL_ERROR "${CASAREST_ERROR_MESSAGE}")
+ else(Casarest_FIND_REQUIRED)
+ message(STATUS "${CASAREST_ERROR_MESSAGE}")
+ endif(Casarest_FIND_REQUIRED)
+endif(CASAREST_FOUND)
+
diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 91bab5a885156a1e4858cd8a7dafe5b2d6cc4375..970c91078aba18facaf6ce983655e8c3cc175d5a 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -28,6 +28,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(ASKAP-Base_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/ASKAPsoft/Base)
set(ASKAP-Components_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/ASKAPsoft/Components)
set(MWImager_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/MWImager)
+ set(CasaGridder_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/CasaGridder)
set(LofarGridder_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/LofarGridder)
set(ASKAPsoft_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/Imager/ASKAPsoft)
set(LMWCommon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/CEP/LMWCommon)