rusty's patch to fix up lib suffix

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68d19e0..9b962d1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ add_definitions(-DPROJECT_NAME="${PROJECT_NAME}")
 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}" CACHE STRING "Directory where lib will install")
 set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
-set (DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "The directory the docs will be installed to")
+set (DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/packages/${PROJECT_NAME}" CACHE PATH "The directory the docs will be installed to")
 
 option(use_qtcore "Use QCoreApplication mainloop " OFF)
 option(websocket_plugin "websocket source and sink plugins" OFF)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 15f019d..11079fd 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(amb ${libtool_LIBRARY} ${glib_LIBRARIES} ${gio_LIBRARIES}
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/automotive-message-broker.pc.in ${CMAKE_CURRENT_BINARY_DIR}/automotive-message-broker.pc @ONLY)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/automotive-message-broker.pc DESTINATION ${LIB_INSTALL_DIR}/${LIB_SUFFIX}/pkgconfig)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/automotive-message-broker.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 install (FILES ${amb_headers_install} DESTINATION ${INCLUDE_INSTALL_DIR}/amb COMPONENT Devel)
 

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 333fd92..4fd6cc1 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -16,8 +16,8 @@ add_library(examplesinkplugin MODULE ${examplesinkplugin_sources})
 set_target_properties(examplesinkplugin PROPERTIES PREFIX "")
 target_link_libraries(examplesinkplugin amb -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)
+install(TARGETS examplesinkplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
+install(TARGETS examplesourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 add_subdirectory(wheel)
 add_subdirectory(dbus)
@@ -29,4 +29,4 @@ add_subdirectory(tpms)
 add_subdirectory(database)
 add_subdirectory(opencvlux)
 add_subdirectory(gpsd)
-add_subdirectory(murphyplugin)
\ No newline at end of file
+add_subdirectory(murphyplugin)

diff --git a/plugins/database/CMakeLists.txt b/plugins/database/CMakeLists.txt
index 305fc45..7666fe9 100644 (file)
--- a/plugins/database/CMakeLists.txt
+++ b/plugins/database/CMakeLists.txt
@@ -12,6 +12,6 @@ add_library(databasesinkplugin MODULE ${databasesinkplugin_sources})
 set_target_properties(databasesinkplugin PROPERTIES PREFIX "")
 target_link_libraries(databasesinkplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${sqlite_LIBRARIES})
 
-install(TARGETS databasesinkplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS databasesinkplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 endif(database_plugin)

diff --git a/plugins/dbus/CMakeLists.txt b/plugins/dbus/CMakeLists.txt
index db38484..5b36547 100644 (file)
--- a/plugins/dbus/CMakeLists.txt
+++ b/plugins/dbus/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(dbussinkplugin MODULE ${dbussinkplugin_sources})
 set_target_properties(dbussinkplugin PROPERTIES PREFIX "")
 target_link_libraries(dbussinkplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES})
 
-install (TARGETS dbussinkplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install (TARGETS dbussinkplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/amb.conf DESTINATION /etc/dbus-1/system.d )
 
 add_custom_target(idl COMMAND c++2idl ${dbussinkplugin_headers} > ${CMAKE_CURRENT_SOURCE_DIR}/amb.idl WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/plugins/dbus/amb-qt/CMakeLists.txt b/plugins/dbus/amb-qt/CMakeLists.txt
index 47c21f5..742ea70 100644 (file)
--- a/plugins/dbus/amb-qt/CMakeLists.txt
+++ b/plugins/dbus/amb-qt/CMakeLists.txt
@@ -22,10 +22,10 @@ add_library(ambqtquick MODULE ${ambqtquick_sources} ${ambqtquick_headers_moc})
 target_link_libraries(amb-qt amb ${QT_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES})
 target_link_libraries(ambqtquick amb-qt ${QT_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES})
 
-install (TARGETS amb-qt LIBRARY DESTINATION lib)
+install (TARGETS amb-qt LIBRARY DESTINATION lib${LIB_SUFFIX})
 
 install (FILES ${ambqt_headers} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/qmldir DESTINATION ${LIB_INSTALL_DIR}/${LIB_SUFFIX}/qt4/imports/amb COMPONENT Devel)
-install (TARGETS ambqtquick DESTINATION ${LIB_INSTALL_DIR}/${LIB_SUFFIX}/qt4/imports/amb)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/qmldir DESTINATION ${LIB_INSTALL_DIR}/qt4/imports/amb COMPONENT Devel)
+install (TARGETS ambqtquick DESTINATION ${LIB_INSTALL_DIR}/qt4/imports/amb)
 
 endif(qt_bindings)

diff --git a/plugins/demosink/CMakeLists.txt b/plugins/demosink/CMakeLists.txt
index 4a1c749..1cc28ba 100644 (file)
--- a/plugins/demosink/CMakeLists.txt
+++ b/plugins/demosink/CMakeLists.txt
@@ -13,4 +13,4 @@ add_library(demosinkplugin MODULE ${demosinkplugin_sources})
 set_target_properties(demosinkplugin PROPERTIES PREFIX "")
 target_link_libraries(demosinkplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries})
 
-install(TARGETS demosinkplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS demosinkplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)

diff --git a/plugins/murphyplugin/CMakeLists.txt b/plugins/murphyplugin/CMakeLists.txt
index 407ab83..b3105ae 100644 (file)
--- a/plugins/murphyplugin/CMakeLists.txt
+++ b/plugins/murphyplugin/CMakeLists.txt
@@ -29,6 +29,6 @@ add_library(murphysourceplugin MODULE ${murphysourceplugin_sources})
 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)
+install(TARGETS murphysourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 endif(murphy_plugin)

diff --git a/plugins/obd2plugin/CMakeLists.txt b/plugins/obd2plugin/CMakeLists.txt
index b3ef230..972d74b 100644 (file)
--- a/plugins/obd2plugin/CMakeLists.txt
+++ b/plugins/obd2plugin/CMakeLists.txt
@@ -15,6 +15,6 @@ add_library(obd2sourceplugin MODULE ${obd2sourceplugin_sources})
 set_target_properties(obd2sourceplugin PROPERTIES PREFIX "")
 target_link_libraries(obd2sourceplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES} ${gio-unix_LIBRARIES} )
 
-install(TARGETS obd2sourceplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS obd2sourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 #endif(obd2_plugin)

diff --git a/plugins/opencvlux/CMakeLists.txt b/plugins/opencvlux/CMakeLists.txt
index 10bbfc7..c965c62 100644 (file)
--- a/plugins/opencvlux/CMakeLists.txt
+++ b/plugins/opencvlux/CMakeLists.txt
@@ -27,6 +27,6 @@ add_library(opencvluxplugin MODULE ${opencvluxplugin_sources} ${opencvluxplugin_
 set_target_properties(opencvluxplugin PROPERTIES PREFIX "")
 target_link_libraries(opencvluxplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${OpenCV_LIBS})
 
-install(TARGETS opencvluxplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS opencvluxplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 endif(opencvlux_plugin)

diff --git a/plugins/websocketsink/CMakeLists.txt b/plugins/websocketsink/CMakeLists.txt
index 242932f..57d3efd 100644 (file)
--- a/plugins/websocketsink/CMakeLists.txt
+++ b/plugins/websocketsink/CMakeLists.txt
@@ -11,6 +11,6 @@ add_library(websocketsinkplugin MODULE ${websocketsinkplugin_sources})
 set_target_properties(websocketsinkplugin PROPERTIES PREFIX "")
 target_link_libraries(websocketsinkplugin amb ${websockets_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries})
 
-install(TARGETS websocketsinkplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS websocketsinkplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 endif(websocket_plugin)

diff --git a/plugins/websocketsourceplugin/CMakeLists.txt b/plugins/websocketsourceplugin/CMakeLists.txt
index 2bf6345..5927597 100644 (file)
--- a/plugins/websocketsourceplugin/CMakeLists.txt
+++ b/plugins/websocketsourceplugin/CMakeLists.txt
@@ -11,6 +11,6 @@ add_library(websocketsourceplugin MODULE ${websocketsourceplugin_sources})
 set_target_properties(websocketsourceplugin PROPERTIES PREFIX "")
 target_link_libraries(websocketsourceplugin amb ${websockets_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries})
 
-install(TARGETS websocketsourceplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS websocketsourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)
 
 endif(websocket_plugin)

diff --git a/plugins/wheel/CMakeLists.txt b/plugins/wheel/CMakeLists.txt
index e0febed..ab04d03 100644 (file)
--- a/plugins/wheel/CMakeLists.txt
+++ b/plugins/wheel/CMakeLists.txt
@@ -13,4 +13,4 @@ add_library(wheelsourceplugin MODULE ${wheelsourceplugin_sources})
 set_target_properties(wheelsourceplugin PROPERTIES PREFIX "")
 target_link_libraries(wheelsourceplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries})
 
-install(TARGETS wheelsourceplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS wheelsourceplugin LIBRARY DESTINATION lib${LIB_SUFFIX}/automotive-message-broker)