diff options
| author | Sangjung Woo <sangjung.woo@samsung.com> | 2016-10-07 21:31:29 +0900 |
|---|---|---|
| committer | Sangjung Woo <sangjung.woo@samsung.com> | 2016-10-07 21:33:45 +0900 |
| commit | 69c4623e87ac959d66b8d55c23cf568a37e75cf0 (patch) | |
| tree | 686d54650b5157d082ed4851c86ff83d873e92ea | |
| parent | 0d3dfce45dd5520ce33b95535ee40eeecd525b38 (diff) | |
| download | automotive-message-broker-69c4623e87ac959d66b8d55c23cf568a37e75cf0.tar.gz | |
AmbSignalMapper: Use GNU standard macro instead of fixed path
Even though generated codes by AmbSignalMapper are built as 64bits environment,
shared library is installed in fixed directory (i.e. lib/automotive-message-broker)
since there is an error in CMakeLists.txt. This patch fixes this bug and
use pre-defined GNU standard macro for more adaptable.
Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com>
| -rw-r--r-- | tools/AmbSignalMapper/lib/Intel/IviPoc/templates/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
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}) - - |