From 4cf07f7d8c90a9450d3ff516adc0a7eb805a3878 Mon Sep 17 00:00:00 2001
From: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>
Date: Tue, 8 Nov 2022 09:34:31 +0530
Subject: CMake: Specify generic library destination for installation

The libraries generated are now installed in lib${LIB_SUFFIX} (lib/lib32/lib64)
directory. This doesn't work with Debian as it expects libraries to be present
in lib/<multiarch-tuple>.

Set the library destination path to 'CMAKE_INSTALL_LIBDIR'.

Signed-off-by: Rajendraprasad K J <KarammelJayakumar.Rajendraprasad@in.bosch.com>

[Khang: Weston installed its modules to dir_module_weston, then loading
modules when run time. It's defined dir_lib/weston. Weston doesn't
puclib the variable via pkgconfig. But we can get the dir_lib via
WESTON_LIBDIR, then we can install the ivi-modules to that directory]

Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
---
 ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt      | 2 +-
 ivi-input-modules/ivi-input-controller/CMakeLists.txt | 2 +-
 ivi-layermanagement-api/ilmClient/CMakeLists.txt      | 2 +-
 ivi-layermanagement-api/ilmCommon/CMakeLists.txt      | 2 +-
 ivi-layermanagement-api/ilmControl/CMakeLists.txt     | 2 +-
 ivi-layermanagement-api/ilmInput/CMakeLists.txt       | 2 +-
 protocol/CMakeLists.txt                               | 2 +-
 weston-ivi-shell/CMakeLists.txt                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
index 101d773..e9544ef 100644
--- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
+++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
@@ -66,5 +66,5 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}/weston
+    LIBRARY DESTINATION ${WESTON_LIBDIR}/weston
 )
diff --git a/ivi-input-modules/ivi-input-controller/CMakeLists.txt b/ivi-input-modules/ivi-input-controller/CMakeLists.txt
index abaf599..62b08c8 100644
--- a/ivi-input-modules/ivi-input-controller/CMakeLists.txt
+++ b/ivi-input-modules/ivi-input-controller/CMakeLists.txt
@@ -91,5 +91,5 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}/weston
+    LIBRARY DESTINATION ${WESTON_LIBDIR}/weston
 )
diff --git a/ivi-layermanagement-api/ilmClient/CMakeLists.txt b/ivi-layermanagement-api/ilmClient/CMakeLists.txt
index 127b951..3ccb322 100644
--- a/ivi-layermanagement-api/ilmClient/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmClient/CMakeLists.txt
@@ -78,7 +78,7 @@ target_link_libraries(${PROJECT_NAME}
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 install (
diff --git a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
index dba855c..7cc314a 100644
--- a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt
@@ -53,7 +53,7 @@ add_dependencies(${PROJECT_NAME}
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 install (
diff --git a/ivi-layermanagement-api/ilmControl/CMakeLists.txt b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
index b0e6b22..69ff2bc 100644
--- a/ivi-layermanagement-api/ilmControl/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
@@ -100,7 +100,7 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 install (
diff --git a/ivi-layermanagement-api/ilmInput/CMakeLists.txt b/ivi-layermanagement-api/ilmInput/CMakeLists.txt
index f2ed324..3d8b46b 100644
--- a/ivi-layermanagement-api/ilmInput/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmInput/CMakeLists.txt
@@ -81,7 +81,7 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 install (
diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
index 548c8ba..7257336 100644
--- a/protocol/CMakeLists.txt
+++ b/protocol/CMakeLists.txt
@@ -70,7 +70,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 
 install(
     TARGETS ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 install(
diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt
index 2eeba66..2868481 100644
--- a/weston-ivi-shell/CMakeLists.txt
+++ b/weston-ivi-shell/CMakeLists.txt
@@ -89,5 +89,5 @@ target_link_libraries(${PROJECT_NAME} ${LIBS})
 
 install (
     TARGETS             ${PROJECT_NAME}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}/weston
+    LIBRARY DESTINATION ${WESTON_LIBDIR}/weston
 )
-- 
cgit v1.2.1