From ccc41f060d4b45fb5b4dee52d247eb1e31ca5b45 Mon Sep 17 00:00:00 2001
From: Jan Rinze Peterzon <peterzon@astron.nl>
Date: Wed, 14 Oct 2015 12:16:57 +0000
Subject: [PATCH] Task #8571: fix CMake requirements on python messaging
library
---
LCS/MessageBus/python/CMakeLists.txt | 4 ++--
LCS/MessageBus/python/messaging/CMakeLists.txt | 4 +++-
LCS/MessageBus/python/messaging/Service.py | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/LCS/MessageBus/python/CMakeLists.txt b/LCS/MessageBus/python/CMakeLists.txt
index 143fa9181b5..d7491b93d5e 100644
--- a/LCS/MessageBus/python/CMakeLists.txt
+++ b/LCS/MessageBus/python/CMakeLists.txt
@@ -1,4 +1,4 @@
# $Id: CMakeLists.txt 1584 2015-10-02 12:10:14Z loose $
-lofar_add_package(PyCommon common)
-lofar_add_package(PyMessaging messaging)
+add_subdirectory(common)
+add_subdirectory(messaging)
diff --git a/LCS/MessageBus/python/messaging/CMakeLists.txt b/LCS/MessageBus/python/messaging/CMakeLists.txt
index cd8fe67af6e..8a20caa152a 100644
--- a/LCS/MessageBus/python/messaging/CMakeLists.txt
+++ b/LCS/MessageBus/python/messaging/CMakeLists.txt
@@ -1,6 +1,6 @@
# $Id$
-lofar_package(PyMessaging 1.0 DEPENDS PyCommon)
+#lofar_package(PyMessaging 1.0 DEPENDS PyCommon)
include(PythonInstall)
@@ -9,6 +9,8 @@ set(_py_files
exceptions.py
messagebus.py
messages.py
+ RPC.py
+ Service.py
)
python_install(${_py_files} DESTINATION messaging)
diff --git a/LCS/MessageBus/python/messaging/Service.py b/LCS/MessageBus/python/messaging/Service.py
index 79c0ec661cc..84403777b08 100644
--- a/LCS/MessageBus/python/messaging/Service.py
+++ b/LCS/MessageBus/python/messaging/Service.py
@@ -42,6 +42,7 @@ class Service():
def __enter__(self):
self.Listen.open()
self.Reply.open()
+ return self
def __exit__(self, exc_type, exc_val, exc_tb):
self.Listen.close()
--
GitLab