From 0dfbb187a05e01490f3fc53caffec9ffe2d5f562 Mon Sep 17 00:00:00 2001
From: Auke Klazema <klazema@astron.nl>
Date: Wed, 27 Mar 2019 13:46:09 +0000
Subject: [PATCH] SW-609: Make cmake find libboost_python3
---
CEP/Calibration/ExpIon/CMakeLists.txt | 2 +-
CEP/Calibration/pystationresponse/CMakeLists.txt | 2 +-
CEP/DP3/DPPP_AOFlag/CMakeLists.txt | 2 +-
CEP/DP3/PythonDPPP/CMakeLists.txt | 2 +-
CEP/Imager/AWImager2/CMakeLists.txt | 2 +-
CEP/pyparmdb/CMakeLists.txt | 2 +-
LCS/WinCCWrapper/CMakeLists.txt | 2 +-
LCS/WinCCWrapper/src/CMakeLists.txt | 2 +-
LCS/pyparameterset/CMakeLists.txt | 2 +-
LCS/pytools/CMakeLists.txt | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/CEP/Calibration/ExpIon/CMakeLists.txt b/CEP/Calibration/ExpIon/CMakeLists.txt
index 3c3ce32fcb3..598fb583165 100644
--- a/CEP/Calibration/ExpIon/CMakeLists.txt
+++ b/CEP/Calibration/ExpIon/CMakeLists.txt
@@ -4,6 +4,6 @@
lofar_package(ExpIon 1.0 DEPENDS pyparameterset pyparmdb)
include(LofarFindPackage)
-lofar_find_package(Boost REQUIRED COMPONENTS python thread)
+lofar_find_package(Boost REQUIRED COMPONENTS python3 thread)
lofar_find_package(Casacore REQUIRED COMPONENTS python scimath)
add_subdirectory(src)
diff --git a/CEP/Calibration/pystationresponse/CMakeLists.txt b/CEP/Calibration/pystationresponse/CMakeLists.txt
index 4c58c0cc4ca..e7c432c3b58 100644
--- a/CEP/Calibration/pystationresponse/CMakeLists.txt
+++ b/CEP/Calibration/pystationresponse/CMakeLists.txt
@@ -4,7 +4,7 @@ lofar_package(pystationresponse 1.0 DEPENDS StationResponse)
include(LofarFindPackage)
lofar_find_package(Python 3.4 REQUIRED)
-lofar_find_package(Boost REQUIRED COMPONENTS python)
+lofar_find_package(Boost REQUIRED COMPONENTS python3)
lofar_find_package(Casacore REQUIRED COMPONENTS python)
add_subdirectory(src)
diff --git a/CEP/DP3/DPPP_AOFlag/CMakeLists.txt b/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
index 2907839328e..2cf77e20107 100644
--- a/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
+++ b/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
@@ -5,7 +5,7 @@ lofar_package(DPPP_AOFlag 1.0 DEPENDS DPPP)
include(LofarFindPackage)
lofar_find_package(AOFlagger REQUIRED)
lofar_find_package(Casacore COMPONENTS casa ms tables REQUIRED)
-lofar_find_package(Boost REQUIRED COMPONENTS date_time thread filesystem system python)
+lofar_find_package(Boost REQUIRED COMPONENTS date_time thread filesystem system python3)
# AOFlagger depends on Python 2.7, see aoflagger CMake
lofar_find_package(Python 3.4 REQUIRED)
#lofar_find_package(GSL)
diff --git a/CEP/DP3/PythonDPPP/CMakeLists.txt b/CEP/DP3/PythonDPPP/CMakeLists.txt
index 9c30a889ca4..fb329585b2d 100644
--- a/CEP/DP3/PythonDPPP/CMakeLists.txt
+++ b/CEP/DP3/PythonDPPP/CMakeLists.txt
@@ -9,7 +9,7 @@ FIND_PATH(BOOST_PYTHON_FOUND "boost/python.hpp")
if(BOOST_PYTHON_FOUND)
include(LofarFindPackage)
lofar_find_package(Python 3.4 REQUIRED)
- lofar_find_package(Boost REQUIRED COMPONENTS python)
+ lofar_find_package(Boost REQUIRED COMPONENTS python3)
lofar_find_package(Casacore COMPONENTS casa ms tables python REQUIRED)
add_subdirectory(include/PythonDPPP)
diff --git a/CEP/Imager/AWImager2/CMakeLists.txt b/CEP/Imager/AWImager2/CMakeLists.txt
index 5c242fe54ae..0a15d9e2b2a 100644
--- a/CEP/Imager/AWImager2/CMakeLists.txt
+++ b/CEP/Imager/AWImager2/CMakeLists.txt
@@ -8,7 +8,7 @@ lofar_find_package(Casa COMPONENTS synthesis components)
if(${CASA_FOUND})
lofar_find_package(Casacore REQUIRED COMPONENTS images msfits coordinates python)
- lofar_find_package(Boost REQUIRED COMPONENTS thread python system)
+ lofar_find_package(Boost REQUIRED COMPONENTS thread python3 system)
lofar_find_package(FFTW3 REQUIRED COMPONENTS single double threads)
lofar_find_package(Python 3.4 REQUIRED)
lofar_find_package(Pyrap REQUIRED)
diff --git a/CEP/pyparmdb/CMakeLists.txt b/CEP/pyparmdb/CMakeLists.txt
index 02c0fd7ca1a..5f2fa1fa12a 100644
--- a/CEP/pyparmdb/CMakeLists.txt
+++ b/CEP/pyparmdb/CMakeLists.txt
@@ -3,7 +3,7 @@
lofar_package(pyparmdb 1.0 DEPENDS Common ParmDB)
include(LofarFindPackage)
-lofar_find_package(Boost REQUIRED COMPONENTS python)
+lofar_find_package(Boost REQUIRED COMPONENTS python3)
lofar_find_package(Python 3.4 REQUIRED)
lofar_find_package(Casacore REQUIRED COMPONENTS python)
diff --git a/LCS/WinCCWrapper/CMakeLists.txt b/LCS/WinCCWrapper/CMakeLists.txt
index 84b66b8cfbc..674d9cfa6cc 100644
--- a/LCS/WinCCWrapper/CMakeLists.txt
+++ b/LCS/WinCCWrapper/CMakeLists.txt
@@ -8,7 +8,7 @@ set(WINCC_ROOT_DIR /opt/WinCC_OA/3.15 CACHE PATH "root dir where the WinCC_OA ap
lofar_find_package(WINCC)
IF(WINCC_FOUND)
- lofar_find_package(Boost REQUIRED python)
+ lofar_find_package(Boost REQUIRED python3)
lofar_find_package(Python 3.4 REQUIRED)
add_subdirectory(include)
diff --git a/LCS/WinCCWrapper/src/CMakeLists.txt b/LCS/WinCCWrapper/src/CMakeLists.txt
index 07d32b47efe..a8a25a103a9 100644
--- a/LCS/WinCCWrapper/src/CMakeLists.txt
+++ b/LCS/WinCCWrapper/src/CMakeLists.txt
@@ -17,7 +17,7 @@ if(BOOST_PYTHON_FOUND)
include(LofarFindPackage)
lofar_find_package(Python 3.4 REQUIRED)
- lofar_find_package(Boost REQUIRED COMPONENTS python)
+ lofar_find_package(Boost REQUIRED COMPONENTS python3)
include(PythonInstall)
set(_py_files __init__.py)
diff --git a/LCS/pyparameterset/CMakeLists.txt b/LCS/pyparameterset/CMakeLists.txt
index 45f520f3f1f..e601dc48602 100644
--- a/LCS/pyparameterset/CMakeLists.txt
+++ b/LCS/pyparameterset/CMakeLists.txt
@@ -3,7 +3,7 @@
lofar_package(pyparameterset 1.0 DEPENDS pytools)
include(LofarFindPackage)
-lofar_find_package(Boost REQUIRED COMPONENTS python)
+lofar_find_package(Boost REQUIRED COMPONENTS python3)
lofar_find_package(Python 3.4 REQUIRED)
add_subdirectory(src)
diff --git a/LCS/pytools/CMakeLists.txt b/LCS/pytools/CMakeLists.txt
index c6928467ae6..d79c543d5ae 100644
--- a/LCS/pytools/CMakeLists.txt
+++ b/LCS/pytools/CMakeLists.txt
@@ -3,7 +3,7 @@
lofar_package(pytools 1.0 DEPENDS Common)
include(LofarFindPackage)
-lofar_find_package(Boost REQUIRED COMPONENTS python)
+lofar_find_package(Boost REQUIRED COMPONENTS python3)
lofar_find_package(Python 3.4 REQUIRED)
add_subdirectory(include/pytools)
--
GitLab