Fix FTBFS for x86_64

Change-Id: I3bb6629e11836dd8b0ef3b88251a039292e2ad23
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce0ebef..fec703f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,9 +15,6 @@ add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}")
 add_definitions(-DPROJECT_NAME="${PROJECT_NAME}")
 add_definitions(-DLATER1024)
 
-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")
-
 include (CMakeForceCompiler)
 option(ENABLE_ICECC "Enable icecc checking, for distributed compilation" OFF)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6e8137..c1a1f81 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(vehicleplugin MODULE ${vehicleplugin_sources})
 set_target_properties(vehicleplugin PROPERTIES PREFIX "")
 target_link_libraries(vehicleplugin amb websockets -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} -lico-util)
 
-install(TARGETS vehicleplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install(TARGETS vehicleplugin LIBRARY DESTINATION ${LIB_INSTALL_DIR}/automotive-message-broker)
 
 set(ico-vic-amb-plugin-conf_docs AMBformat.conf)
 install (FILES ${ico-vic-amb-plugin-conf_docs} DESTINATION ${CONF_INSTALL_DIR})