SW-612: Do not refer to Pyrap any more but to casacore python

CEP/Calibration/ExpIon/CMakeLists.txt

@@ -4,7 +4,6 @@
 lofar_package(ExpIon 1.0 DEPENDS pyparameterset pyparmdb)
 
 include(LofarFindPackage)
-lofar_find_package(Pyrap REQUIRED)
 lofar_find_package(Boost REQUIRED COMPONENTS python thread)
-lofar_find_package(Casacore REQUIRED COMPONENTS scimath)
+lofar_find_package(Casacore REQUIRED COMPONENTS python scimath)
 add_subdirectory(src)

CEP/Calibration/pystationresponse/test/CMakeLists.txt

@@ -2,14 +2,14 @@
 
 include(LofarCTest)
 
-include(FindPythonModule)
+include(LofarFindPackage)
 
-find_python_module(pyrap)
-if(PYTHON_PYRAP_FOUND)
+lofar_find_package(Casacore REQUIRED COMPONENTS python)
+if(CASA_PYTHON3_LIBRARY)
   #This test is disabled due to boost-python linking problems on CEP3
   #lofar_add_test(tStationBeamNCP)
-else(PYTHON_PYRAP_FOUND)
+else(CASA_PYTHON3_LIBRARY)
   message(WARNING "Python-casacore was not found, disabling tStationBeamNCP")
-endif(PYTHON_PYRAP_FOUND)
+endif(CASA_PYTHON3_LIBRARY)
 
 lofar_add_test(tpystationresponse)

CEP/DP3/PythonDPPP/CMakeLists.txt

@@ -8,10 +8,9 @@ FIND_PATH(BOOST_PYTHON_FOUND "boost/python.hpp")
 
 if(BOOST_PYTHON_FOUND)
   include(LofarFindPackage)
-  lofar_find_package(Pyrap REQUIRED)
   lofar_find_package(Python 3.4 REQUIRED)
   lofar_find_package(Boost REQUIRED COMPONENTS python)
-  lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
+  lofar_find_package(Casacore COMPONENTS casa ms tables python REQUIRED)
 
   add_subdirectory(include/PythonDPPP)
   add_subdirectory(src)