diff options
| author | Kevron Rees <tripzero.kev@gmail.com> | 2016-10-07 09:14:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 09:14:41 -0700 |
| commit | 62f385218d3d33d2db867b5c35d1e3e277471764 (patch) | |
| tree | 686d54650b5157d082ed4851c86ff83d873e92ea | |
| parent | ef767aed1fc86c5b601fb3ad0d1e29a4090831f3 (diff) | |
| parent | 69c4623e87ac959d66b8d55c23cf568a37e75cf0 (diff) | |
| download | automotive-message-broker-62f385218d3d33d2db867b5c35d1e3e277471764.tar.gz | |
Merge pull request #81 from again4you/fix_bug_v2
Fix #78, #79, #82 issues (v2)
| -rw-r--r-- | lib/automotive-message-broker.pc.in | 4 | ||||
| -rw-r--r-- | plugins/common/amb-plugins-common.pc.in | 4 | ||||
| -rw-r--r-- | tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tools/ambctl.py | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/lib/automotive-message-broker.pc.in b/lib/automotive-message-broker.pc.in index 2602b31b..770043f7 100644 --- a/lib/automotive-message-broker.pc.in +++ b/lib/automotive-message-broker.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@LIB_INSTALL_DIR@ -includedir=@INCLUDE_INSTALL_DIR@/amb +libdir=${prefix}/@LIB_INSTALL_DIR@ +includedir=${prefix}/@INCLUDE_INSTALL_DIR@/amb Name: automotive-message-broker Description: Message Broker for vehicle data diff --git a/plugins/common/amb-plugins-common.pc.in b/plugins/common/amb-plugins-common.pc.in index 8871c5ed..6fd6df2c 100644 --- a/plugins/common/amb-plugins-common.pc.in +++ b/plugins/common/amb-plugins-common.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@LIB_INSTALL_DIR@ -includedir=@INCLUDE_INSTALL_DIR@/amb +libdir=${prefix}/@LIB_INSTALL_DIR@ +includedir=${prefix}/@INCLUDE_INSTALL_DIR@/amb Name: amb-plugins-common Description: diff --git a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt index 59d5344a..a04013a2 100644 --- a/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt +++ b/tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt @@ -1,9 +1,10 @@ cmake_minimum_required(VERSION 2.8) +include(GNUInstallDirs) + set(CMAKE_VERBOSE_MAKEFILE on ) set(PLUGIN_SEGMENT_INSTALL_PATH "/etc/ambd/plugins.d") -set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) -set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}" ) +set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") set(PLUGIN_INSTALL_PATH "${LIB_INSTALL_DIR}/automotive-message-broker") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") @@ -71,7 +72,5 @@ add_library(ambtmpl_plugin MODULE ${ambtmpl_plugin_sources} ${ambtmpl_plugin_hea set_target_properties(ambtmpl_plugin PROPERTIES PREFIX "") target_link_libraries(ambtmpl_plugin ${link_libraries} ${libamb_LIBRARY} ${amb_LIBRARIES} ${amb-plugins-common_LIBRARIES}) -install(TARGETS ambtmpl_plugin LIBRARY DESTINATION "lib/automotive-message-broker") +install(TARGETS ambtmpl_plugin LIBRARY DESTINATION ${LIB_INSTALL_DIR}/automotive-message-broker) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ambtmpl DESTINATION ${PLUGIN_SEGMENT_INSTALL_PATH}) - - diff --git a/tools/ambctl.py b/tools/ambctl.py index cb091a73..8cf0dfe2 100644 --- a/tools/ambctl.py +++ b/tools/ambctl.py @@ -210,7 +210,7 @@ def processCommand(command, commandArgs, noMain=True): pass if not noMain == True: try: - main_loop = gobject.MainLoop(None, False) + main_loop = GObject.MainLoop() main_loop.run() except KeyboardInterrupt: return 1 |