diff --git a/CEP/CMakeLists.txt b/CEP/CMakeLists.txt
index 163f31f4d1323f22473e07361c14c98c230767ea..20d47d86284f3223c881d9fd1590cd879187ee2a 100644
--- a/CEP/CMakeLists.txt
+++ b/CEP/CMakeLists.txt
@@ -40,6 +40,7 @@ lofar_add_subdirectory(ParmDB)
lofar_add_subdirectory(Calibration)
lofar_add_subdirectory(DP3)
lofar_add_subdirectory(Imager)
+
lofar_add_subdirectory(Pipeline)
lofar_add_subdirectory(pyparmdb)
diff --git a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
index 825d0b1a40bf869a96612dde1c03911d64ca7dae..6e9170ddfaa7c380f34688755c4c7a1f488d9541 100644
--- a/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
+++ b/CEP/DP3/DPPP/include/DPPP/CMakeLists.txt
@@ -32,6 +32,7 @@ set(inst_HEADERS
DataBuffer.h
TimeBuffer.h
RunDetails.h
+ ProgressMeter.h
Pipeline.h)
# Create symbolic link to include directory.
diff --git a/CEP/DP3/DPPP/src/CMakeLists.txt b/CEP/DP3/DPPP/src/CMakeLists.txt
index 2705023450842d8598f68d00f9ca3a48f3e38e83..2ac23bf454b112deccc97405f3ad4e7d63b3f778 100644
--- a/CEP/DP3/DPPP/src/CMakeLists.txt
+++ b/CEP/DP3/DPPP/src/CMakeLists.txt
@@ -34,6 +34,7 @@ lofar_add_library(dppp
DataBuffer.cc
TimeBuffer.cc
RunDetails.cc
+ ProgressMeter.cc
Pipeline.cc)
lofar_add_bin_program(CS1_IDPPP IDPPP.cc PipelineProcessControl.cc)
diff --git a/CEP/Pipeline/CMakeLists.txt b/CEP/Pipeline/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c83b60f37ac2a81e474d51481cd3bb967f82c10d
--- /dev/null
+++ b/CEP/Pipeline/CMakeLists.txt
@@ -0,0 +1,52 @@
+# $Id$
+#
+# Copyright (C) 2008-2009
+# ASTRON (Netherlands Foundation for Research in Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+cmake_minimum_required(VERSION 2.6)
+
+## ---------------------------------------------------------------------------
+## Preamble: set compilers
+## ---------------------------------------------------------------------------
+include(LofarInit)
+
+## ---------------------------------------------------------------------------
+## Project characteristics
+## ---------------------------------------------------------------------------
+project(Pipeline)
+include(LofarGeneral)
+
+include(LofarAddPackage)
+lofar_add_package(${PROJECT_NAME} 0.1 DEPENDS pytools)
+
+## ---------------------------------------------------------------------------
+## External packages
+## ---------------------------------------------------------------------------
+include(LofarFindPackage)
+lofar_find_package(Python REQUIRED)
+
+## ---------------------------------------------------------------------------
+## Generate configuration header file.
+## ---------------------------------------------------------------------------
+include(LofarConfig)
+
+## ---------------------------------------------------------------------------
+## Subdirectories
+## ---------------------------------------------------------------------------
+add_subdirectory(Core)
+add_subdirectory(library)
diff --git a/CEP/Pipeline/library/CMakeLists.txt b/CEP/Pipeline/library/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ea2a94b3d160dd5f16648cdd09ad6faef68458dc
--- /dev/null
+++ b/CEP/Pipeline/library/CMakeLists.txt
@@ -0,0 +1,37 @@
+# $Id$
+#
+# Copyright (C) 2008-2009
+# ASTRON (Netherlands Foundation for Research in Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#
+# This program 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 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+include(PythonInstall)
+
+# Python modules.
+python_install(
+ __init__.py
+ Observation.py
+ sysconfig.py
+ DESTINATION lofar/pipeline)
+
+# Python scripts
+install(PROGRAMS
+ dppp_node.py
+ DPPP.py
+ MakeVDS.py
+ MWImager.py
+ StandardImagingPipeline.py
+ DESTINATION bin)
diff --git a/CMake/PythonInstall.cmake b/CMake/PythonInstall.cmake
index f9ae2f76cd2e9ab7bd70f62f5780bb1751c22b57..1ea9c5eadfa2738bfe3baae012964bfec1b6de44 100644
--- a/CMake/PythonInstall.cmake
+++ b/CMake/PythonInstall.cmake
@@ -48,12 +48,14 @@ macro(python_install)
message(FATAL_ERROR "python_install: destination directory invalid")
endif(_dest_dir MATCHES "^$" OR _dest_dir MATCHES ";")
+ # Set python package install directory.
set(_dest_dir "${PYTHON_INSTALL_DIR}/${_dest_dir}")
# Byte-compile each Python file and add both .py and .pyc to install list.
+ file(RELATIVE_PATH _rel_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
set(_pyc_files)
foreach(_py ${_py_files})
- set(_comment "Byte-compiling ${_py}")
+ set(_comment "Byte-compiling ${_rel_path}/${_py}")
set(_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_py}c)
set(_py ${CMAKE_CURRENT_SOURCE_DIR}/${_py})
add_custom_command(OUTPUT ${_pyc}
diff --git a/LCS/pyparameterset/src/CMakeLists.txt b/LCS/pyparameterset/src/CMakeLists.txt
index 9d8e8f654565971c5d264714fa871e1541b6dec2..99a088affd26ae92a942a755d0a6a79c10b52d48 100644
--- a/LCS/pyparameterset/src/CMakeLists.txt
+++ b/LCS/pyparameterset/src/CMakeLists.txt
@@ -34,5 +34,4 @@ lofar_add_bin_program(versionpyparameterset
# Install Python modules
include(PythonInstall)
-python_install(__init__.py
- DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset)
+python_install(__init__.py DESTINATION lofar/parameterset)
diff --git a/LCS/pytools/src/CMakeLists.txt b/LCS/pytools/src/CMakeLists.txt
index bf37d83250ca22d7f164821c453992778e267869..01aea4df331d64a27ff06aa5dbef36da4d32e45d 100644
--- a/LCS/pytools/src/CMakeLists.txt
+++ b/LCS/pytools/src/CMakeLists.txt
@@ -20,5 +20,5 @@
include(PythonInstall)
-python_install(__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/lofar)
+python_install(__init__.py DESTINATION lofar)