From 96ff8f2864384a767e1479a82886bd022dce2fc1 Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Tue, 26 Jan 2021 14:24:31 +0900 Subject: Apply rpm macro of hal install path Change-Id: I3dac37a2c00d47d513c118229f269c68efa6176e Signed-off-by: Yunmi Ha --- CMakeLists.txt | 2 ++ hw/battery/CMakeLists.txt | 2 +- hw/display/CMakeLists.txt | 2 +- hw/external_connection/CMakeLists.txt | 2 +- hw/haptic/CMakeLists.txt | 2 +- hw/usb_gadget/CMakeLists.txt | 2 +- packaging/device-manager-plugin-emul.spec | 6 ++++-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c624d3..78de54d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${HAL_LICENSE_DIR}/device-manager-plugin-emul COMPONENT RuntimeLibraries) + ADD_SUBDIRECTORY(hw/battery) ADD_SUBDIRECTORY(hw/display) ADD_SUBDIRECTORY(hw/external_connection) diff --git a/hw/battery/CMakeLists.txt b/hw/battery/CMakeLists.txt index fa59860..6298cb6 100644 --- a/hw/battery/CMakeLists.txt +++ b/hw/battery/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE battery.c ../dbus.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-battery_pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/display/CMakeLists.txt b/hw/display/CMakeLists.txt index d5a5a3a..037e489 100644 --- a/hw/display/CMakeLists.txt +++ b/hw/display/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE display.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-display_pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/external_connection/CMakeLists.txt b/hw/external_connection/CMakeLists.txt index c80f6fb..58c4c65 100644 --- a/hw/external_connection/CMakeLists.txt +++ b/hw/external_connection/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE external_connection.c ../dbus.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-external-connection_pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/haptic/CMakeLists.txt b/hw/haptic/CMakeLists.txt index f271572..f474599 100644 --- a/hw/haptic/CMakeLists.txt +++ b/hw/haptic/CMakeLists.txt @@ -22,4 +22,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE emulator.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${haptic_pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/usb_gadget/CMakeLists.txt b/hw/usb_gadget/CMakeLists.txt index efebc32..35e615e 100644 --- a/hw/usb_gadget/CMakeLists.txt +++ b/hw/usb_gadget/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE usb_gadget.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-usb-gadget_pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/packaging/device-manager-plugin-emul.spec b/packaging/device-manager-plugin-emul.spec index 83d13ab..cd51be6 100644 --- a/packaging/device-manager-plugin-emul.spec +++ b/packaging/device-manager-plugin-emul.spec @@ -27,6 +27,8 @@ Emulator plugin for libdevice-node. %build export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed" %cmake . -DENABLE_DLOG=on \ + -DHAL_LIB_DIR=%{_hal_libdir} \ + -DHAL_LICENSE_DIR=%{_hal_licensedir} make @@ -40,8 +42,8 @@ make /sbin/ldconfig %files -%license LICENSE +%{_hal_licensedir}/%{name}/LICENSE %defattr(-,root,root,-) %manifest device-manager-plugin-emul.manifest %{_libdir}/libslp_devman_plugin.so -/hal/lib/*.so* +%{_hal_libdir}/*.so* -- cgit v1.2.3