From 3e9ffec22d389b347bb77af7c66c0647413a3a0e Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 27 Mar 2015 10:10:29 +0000
Subject: [PATCH] Task #7573: Configure pipeline.cfg such that no QPID feedback
will be attempted if QPID is not used
---
CEP/Pipeline/recipes/CMakeLists.txt | 4 ++++
CEP/Pipeline/recipes/sip/CMakeLists.txt | 7 +++++++
CEP/Pipeline/recipes/sip/pipeline.cfg.in | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/CEP/Pipeline/recipes/CMakeLists.txt b/CEP/Pipeline/recipes/CMakeLists.txt
index baa1a584c23..608dee21588 100644
--- a/CEP/Pipeline/recipes/CMakeLists.txt
+++ b/CEP/Pipeline/recipes/CMakeLists.txt
@@ -2,4 +2,8 @@
lofar_package(Pipeline-Recipes 0.1)
+# The pipeline.cfg needs to know whether QPID is installed
+include(LofarFindPackage)
+lofar_find_package(QPID)
+
add_subdirectory(sip)
diff --git a/CEP/Pipeline/recipes/sip/CMakeLists.txt b/CEP/Pipeline/recipes/sip/CMakeLists.txt
index b93dd298113..f12038ba6a4 100644
--- a/CEP/Pipeline/recipes/sip/CMakeLists.txt
+++ b/CEP/Pipeline/recipes/sip/CMakeLists.txt
@@ -96,6 +96,13 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/tasks.cfg
DESTINATION share/pipeline)
+# PIPELINE_FEEDBACK_METHOD is used in pipeline.cfg.in to enable/disable qpid feedback
+if(HAVE_QPID)
+ set(PIPELINE_FEEDBACK_METHOD "messagebus")
+else(HAVE_QPID)
+ set(PIPELINE_FEEDBACK_METHOD "none")
+endif(HAVE_QPID)
+
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/pipeline.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/pipeline.cfg)
diff --git a/CEP/Pipeline/recipes/sip/pipeline.cfg.in b/CEP/Pipeline/recipes/sip/pipeline.cfg.in
index 2b311047dd9..a45a23a6b83 100644
--- a/CEP/Pipeline/recipes/sip/pipeline.cfg.in
+++ b/CEP/Pipeline/recipes/sip/pipeline.cfg.in
@@ -29,4 +29,4 @@ xml_stat_file = %(runtime_directory)s/%(job_name)s/logs/%(start_time)s/statistic
# Valid options:
# messagebus Send feedback and status using LCS/MessageBus
# none Do NOT send feedback and status
-method = messagebus
+method = @PIPELINE_FEEDBACK_METHOD@
--
GitLab