From c7687a2ab51ec3d2c4ccc6cf9cd6a73a5e83e5ea Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Wed, 5 Sep 2012 15:17:18 -0700 Subject: [PATCH] fixed parallalel building and make install --- ambd/CMakeLists.txt | 2 +- ambd/config | 5 +++++ ambd/main.cpp | 2 +- config | 5 ----- plugins/CMakeLists.txt | 5 ++++- plugins/dbus/CMakeLists.txt | 2 +- plugins/obd2plugin/CMakeLists.txt | 2 +- plugins/websocketsink/CMakeLists.txt | 2 +- plugins/wheel/CMakeLists.txt | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 ambd/config delete mode 100644 config diff --git a/ambd/CMakeLists.txt b/ambd/CMakeLists.txt index bfe0e4d..d301b61 100644 --- a/ambd/CMakeLists.txt +++ b/ambd/CMakeLists.txt @@ -4,4 +4,4 @@ include_directories(${include_dirs} ) target_link_libraries(ambd ${link_libraries} amb) install (TARGETS ambd RUNTIME DESTINATION bin) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/config DESTINATION /etc/ambd) +install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/config DESTINATION /etc/ambd) diff --git a/ambd/config b/ambd/config new file mode 100644 index 0000000..1c5480b --- /dev/null +++ b/ambd/config @@ -0,0 +1,5 @@ +{ + "sources" : [ "/usr/lib/automotive-message-broker/examplesourceplugin.so" ], + "sinks": [ "/usr/lib/automotive-message-broker/examplesinkplugin.so", "/usr/lib/automotive-message-broker/dbussinkplugin.so" ,"/usr/lib/automotive-message-broker/websocketsinkplugin.so" ] +} + diff --git a/ambd/main.cpp b/ambd/main.cpp index 0a728c0..4902dfd 100644 --- a/ambd/main.cpp +++ b/ambd/main.cpp @@ -189,7 +189,7 @@ void printhelp(const char *argv0) printf("Usage: %s [args]\n" " [-d|--daemonise]\n" " [-v|--version]\n" - " [-c]--config \t]" + " [-c]--config \t]\n" " [-h|--help]\n" , argv0); } diff --git a/config b/config deleted file mode 100644 index bc39085..0000000 --- a/config +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sources" : [ "../plugins/examplesourceplugin.so" ], - "sinks": [ "../plugins/examplesinkplugin.so", "../plugins/dbus/dbussinkplugin.so" ,"../plugins/websocketsink/websocketsinkplugin.so" ] -} - diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index fdec91f..f06e3f9 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -16,9 +16,12 @@ add_library(examplesinkplugin MODULE ${examplesinkplugin_sources}) set_target_properties(examplesinkplugin PROPERTIES PREFIX "") target_link_libraries(examplesinkplugin -lamb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) +install(TARGETS examplesinkplugin LIBRARY DESTINATION lib/automotive-message-broker) +install(TARGETS examplesourceplugin LIBRARY DESTINATION lib/automotive-message-broker) + add_subdirectory(wheel) add_subdirectory(dbus) add_subdirectory(websocketsink) add_subdirectory(obd2plugin) -add_subdirectory(websocketsourceplugin) \ No newline at end of file +add_subdirectory(websocketsourceplugin) diff --git a/plugins/dbus/CMakeLists.txt b/plugins/dbus/CMakeLists.txt index 6bca949..0656767 100644 --- a/plugins/dbus/CMakeLists.txt +++ b/plugins/dbus/CMakeLists.txt @@ -8,6 +8,6 @@ set(dbussinkplugin_sources dbusplugin.cpp abstractproperty.cpp abstractdbusinter add_library(dbussinkplugin MODULE ${dbussinkplugin_sources}) set_target_properties(dbussinkplugin PROPERTIES PREFIX "") -target_link_libraries(dbussinkplugin -lamb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES}) +target_link_libraries(dbussinkplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES}) install (TARGETS dbussinkplugin LIBRARY DESTINATION lib/automotive-message-broker) diff --git a/plugins/obd2plugin/CMakeLists.txt b/plugins/obd2plugin/CMakeLists.txt index 472e3f0..26bbd39 100644 --- a/plugins/obd2plugin/CMakeLists.txt +++ b/plugins/obd2plugin/CMakeLists.txt @@ -5,6 +5,6 @@ set(obd2sourceplugin_headers obd2source.h obdlib.h) set(obd2sourceplugin_sources obd2source.cpp obdlib.cpp) add_library(obd2sourceplugin MODULE ${obd2sourceplugin_sources}) set_target_properties(obd2sourceplugin PROPERTIES PREFIX "") -target_link_libraries(obd2sourceplugin -lamb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) +target_link_libraries(obd2sourceplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) install(TARGETS obd2sourceplugin LIBRARY DESTINATION lib/automotive-message-broker) diff --git a/plugins/websocketsink/CMakeLists.txt b/plugins/websocketsink/CMakeLists.txt index c64cd1f..3010eca 100644 --- a/plugins/websocketsink/CMakeLists.txt +++ b/plugins/websocketsink/CMakeLists.txt @@ -7,6 +7,6 @@ set(websocketsinkplugin_headers websocketsink.h websocketmanager.h) set(websocketsinkplugin_sources websocketsinkmanager.cpp websocketsink.cpp) add_library(websocketsinkplugin MODULE ${websocketsinkplugin_sources}) set_target_properties(websocketsinkplugin PROPERTIES PREFIX "") -target_link_libraries(websocketsinkplugin -lamb -lwebsockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) +target_link_libraries(websocketsinkplugin amb websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) install(TARGETS websocketsinkplugin LIBRARY DESTINATION lib/automotive-message-broker) diff --git a/plugins/wheel/CMakeLists.txt b/plugins/wheel/CMakeLists.txt index 10658ef..e0febed 100644 --- a/plugins/wheel/CMakeLists.txt +++ b/plugins/wheel/CMakeLists.txt @@ -11,6 +11,6 @@ set(wheelsourceplugin_sources wheelplugin.cpp) add_library(wheelsourceplugin MODULE ${wheelsourceplugin_sources}) set_target_properties(wheelsourceplugin PROPERTIES PREFIX "") -target_link_libraries(wheelsourceplugin -lamb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) +target_link_libraries(wheelsourceplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries}) install(TARGETS wheelsourceplugin LIBRARY DESTINATION lib/automotive-message-broker) -- 2.7.4