From baf9010a5c84d1934c7dcd9f4ec4abb7bc54818e Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Fri, 31 Jan 2014 11:18:51 -0800 Subject: [PATCH] install amb-get --- CMakeLists.txt | 2 +- plugins/dbus/abstractdbusinterface.cpp | 4 ++-- plugins/websocketsourceplugin/CMakeLists.txt | 4 ++-- tests/CMakeLists.txt | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 725513d..04f33d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_BUILD_TYPE, Debug) include(FindPkgConfig) set(PROJECT_NAME "automotive-message-broker") -set(PROJECT_VERSION "0.11.800") +set(PROJECT_VERSION "0.11.801") set(PROJECT_CODENAME "veyron") set(PROJECT_QUALITY "alpha") diff --git a/plugins/dbus/abstractdbusinterface.cpp b/plugins/dbus/abstractdbusinterface.cpp index 09d3b15..9dd8566 100644 --- a/plugins/dbus/abstractdbusinterface.cpp +++ b/plugins/dbus/abstractdbusinterface.cpp @@ -273,8 +273,8 @@ void AbstractDBusInterface::registerObject() if(!boost::algorithm::ends_with(introspectionXml,"")) { - introspectionXml += ""; - introspectionXml += ""; + introspectionXml += "" + ""; } GError* error=NULL; diff --git a/plugins/websocketsourceplugin/CMakeLists.txt b/plugins/websocketsourceplugin/CMakeLists.txt index a990fe5..2499423 100644 --- a/plugins/websocketsourceplugin/CMakeLists.txt +++ b/plugins/websocketsourceplugin/CMakeLists.txt @@ -1,4 +1,4 @@ -if(websocketsource_plugin) +if(websocketold_plugin) include(CheckIncludeFiles) include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs}) @@ -13,4 +13,4 @@ target_link_libraries(websocketsourceplugin amb ${websockets_LIBRARIES} -L${CMAK install(TARGETS websocketsourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker) -endif(websocketsource_plugin) +endif(websocketold_plugin) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e69de29..cef0266 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -0,0 +1,3 @@ +set(amb_tests amb-get) +install (PROGRAMS ${amb_tests} DESTINATION bin) + -- 2.7.4