Fix FTBFS for x86_64

Use ${LIB_INSTALL_DIR} instead of a hard coded lib install path.

Note: ${LIB_SUFFIX} is set in %cmake Tizen RPM macro.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1d943e..d5e30ee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,8 @@ project(wayland-ivi-extension)
 SET(IVI_EXTENSION_VERSION 1.0.0)
 SET(ILM_API_VERSION 1.2.0)
 
+SET(LIB_INSTALL_DIR lib${LIB_SUFFIX})
+
 add_subdirectory(protocol)
 
 add_subdirectory(weston-ivi-shell)

diff --git a/ivi-layermanagement-api/ilmClient/CMakeLists.txt b/ivi-layermanagement-api/ilmClient/CMakeLists.txt
index 39b877c..f67255b 100644 (file)
--- a/ivi-layermanagement-api/ilmClient/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmClient/CMakeLists.txt
@@ -59,7 +59,7 @@ target_link_libraries(${PROJECT_NAME}
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 )
 
 install (

diff --git a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
index e57e3c6..0e9af83 100644 (file)
--- a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
@@ -54,7 +54,7 @@ add_dependencies(${PROJECT_NAME}
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 )
 
 install (

diff --git a/ivi-layermanagement-api/ilmControl/CMakeLists.txt b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
index 3fd318c..bcaeb27 100644 (file)
--- a/ivi-layermanagement-api/ilmControl/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
@@ -61,7 +61,7 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 )
 
 install (

diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt
index cd4425a..6c37e59 100644 (file)
--- a/weston-ivi-shell/CMakeLists.txt
+++ b/weston-ivi-shell/CMakeLists.txt
@@ -88,5 +88,5 @@ target_link_libraries(${PROJECT_NAME} ${LIBS} ${WESTON_LIBDIR}/weston/ivi-shell.
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib/weston
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}/weston
 )