From 8bac2c428b4bbead92cb114a40f6806273c1053b Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Mon, 18 Mar 2013 11:12:36 -0700 Subject: [PATCH] fixed murphy plugin get reply --- CMakeLists.txt | 1 + plugins/murphyplugin/CMakeLists.txt | 4 ++++ plugins/murphyplugin/murphysource.cpp | 1 + 3 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f790ec2..0e3a081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ option(database_plugin "Database plugins" OFF) option(qt_bindings "AMB Qt DBus bindings" OFF) option(opencvlux_plugin "OpenCV Lux plugin" OFF) option(gpsd_plugin "gpsd location plugin" OFF) +option(murphy_plugin "murphy policy framework plugin" OFF) if(opencvlux_plugin) message(STATUS "OpenCV Lux plugin enabled") diff --git a/plugins/murphyplugin/CMakeLists.txt b/plugins/murphyplugin/CMakeLists.txt index 47b9bfd..407ab83 100644 --- a/plugins/murphyplugin/CMakeLists.txt +++ b/plugins/murphyplugin/CMakeLists.txt @@ -1,3 +1,5 @@ +if(murphy_plugin) + include(CheckIncludeFiles) include(FindPkgConfig) @@ -28,3 +30,5 @@ set_target_properties(murphysourceplugin PROPERTIES PREFIX "") target_link_libraries(murphysourceplugin amb ${MURPHY_COMMON_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) install(TARGETS murphysourceplugin LIBRARY DESTINATION lib/automotive-message-broker) + +endif(murphy_plugin) diff --git a/plugins/murphyplugin/murphysource.cpp b/plugins/murphyplugin/murphysource.cpp index 3af5df1..fca92f4 100644 --- a/plugins/murphyplugin/murphysource.cpp +++ b/plugins/murphyplugin/murphysource.cpp @@ -353,6 +353,7 @@ void MurphySource::getPropertyAsync(AsyncPropertyReply *reply) if (murphyProperties.find(reply->property) != murphyProperties.end()) { AbstractPropertyType *prop = murphyProperties[reply->property]; reply->value = prop; + reply->success = true; reply->completed(reply); } } -- 2.7.4