From 26d25e6aaf27c05dd2b7fff37318788d2a299cbb Mon Sep 17 00:00:00 2001
From: Tammo Jan Dijkema <dijkema@astron.nl>
Date: Wed, 16 May 2018 11:06:31 +0000
Subject: [PATCH] Task #11555: fix DPPP_AOFlag compilation with newer AOFlag
with GTKMM
---
CEP/DP3/DPPP_AOFlag/CMakeLists.txt | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/CEP/DP3/DPPP_AOFlag/CMakeLists.txt b/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
index 6f881f3861d..a9a4d3d004a 100644
--- a/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
+++ b/CEP/DP3/DPPP_AOFlag/CMakeLists.txt
@@ -5,7 +5,9 @@ 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)
+lofar_find_package(Boost REQUIRED COMPONENTS date_time thread filesystem system python)
+# AOFlagger depends on Python 2.7, see aoflagger CMake
+lofar_find_package(Python 2.7 REQUIRED)
#lofar_find_package(GSL)
lofar_find_package(LibXml2 REQUIRED)
lofar_find_package(PNG REQUIRED)
@@ -16,6 +18,17 @@ lofar_find_package(CFITSIO REQUIRED)
# list(APPEND LOFAR_EXTRA_LIBRARIES ${RT_LIBRARY})
#endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+# Copied from AOFlagger CMakeLists to link in GTKMM if AOFlagger was built with it
+find_package(PkgConfig)
+pkg_check_modules(GTKMM gtkmm-3.0>=3.0.0)
+pkg_check_modules(GLIBMM glibmm-2.4)
+pkg_check_modules(SIGCXX sigc++-2.0)
+
+if(GTKMM_FOUND)
+ set(LOFAR_EXTRA_LIBRARIES ${LOFAR_EXTRA_LIBRARIES} ${GTKMM_LIBRARIES} ${GLIBMM_LIBRARIES})
+endif(GTKMM_FOUND)
+# End check for GTKMM
+
add_subdirectory(include/DPPP_AOFlag)
add_subdirectory(src)
add_subdirectory(test)
--
GitLab