diff options
author | lokilee73 <changjoo.lee@samsung.com> | 2021-01-26 13:26:20 +0900 |
---|---|---|
committer | lokilee73 <changjoo.lee@samsung.com> | 2021-01-26 13:55:16 +0900 |
commit | c3bc2ccc85af09da4c7693f1e801304ad9222bd1 (patch) | |
tree | c644983ad4c148bec8f20f4e0b643bdba4f5ffad | |
parent | 38a4bfd1377244d11598a118c2c4cf1202b7197d (diff) | |
download | device-tm1-c3bc2ccc85af09da4c7693f1e801304ad9222bd1.tar.gz device-tm1-c3bc2ccc85af09da4c7693f1e801304ad9222bd1.tar.bz2 device-tm1-c3bc2ccc85af09da4c7693f1e801304ad9222bd1.zip |
Apply rpm macro of hal install path
Change-Id: I172ed017a72f4f7e73711e1b641a24e5678c5fc3
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | hw/battery/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/board/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/display/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/external_connection/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/ir/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/led/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/thermal/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/touchscreen/CMakeLists.txt | 2 | ||||
-rw-r--r-- | hw/usb_gadget/CMakeLists.txt | 2 | ||||
-rw-r--r-- | packaging/device-manager-plugin-sc7730.spec | 8 |
11 files changed, 17 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d65860..6d716e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(device-manager-sc7730 C) +PROJECT(device-manager-plugin-sc7730 C) SET(CMAKE_VERBOSE_MAKEFILE OFF) @@ -11,6 +11,8 @@ IF(ENABLE_DLOG STREQUAL on) ADD_DEFINITIONS("-DFEATURE_DLOG") ENDIF() +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.Apache-2.0 DESTINATION ${HAL_LICENSE_DIR}/${PROJECT_NAME}) + ADD_SUBDIRECTORY(hw/battery) ADD_SUBDIRECTORY(hw/display) ADD_SUBDIRECTORY(hw/led) diff --git a/hw/battery/CMakeLists.txt b/hw/battery/CMakeLists.txt index 614bae4..3649f14 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 ../udev.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/board/CMakeLists.txt b/hw/board/CMakeLists.txt index 9ed63d3..b18358f 100644 --- a/hw/board/CMakeLists.txt +++ b/hw/board/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE board.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-board_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 44639b7..49eee92 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 1164421..6f3c189 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 ../udev.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/ir/CMakeLists.txt b/hw/ir/CMakeLists.txt index 97baed8..4478493 100644 --- a/hw/ir/CMakeLists.txt +++ b/hw/ir/CMakeLists.txt @@ -14,4 +14,4 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE ir.c) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/led/CMakeLists.txt b/hw/led/CMakeLists.txt index 811a279..9457c9a 100644 --- a/hw/led/CMakeLists.txt +++ b/hw/led/CMakeLists.txt @@ -14,4 +14,4 @@ SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE led.c) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /hal/lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${HAL_LIB_DIR} COMPONENT RuntimeLibraries) diff --git a/hw/thermal/CMakeLists.txt b/hw/thermal/CMakeLists.txt index 82f0dd2..4584579 100644 --- a/hw/thermal/CMakeLists.txt +++ b/hw/thermal/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE thermal.c ../udev.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-thermal_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/touchscreen/CMakeLists.txt b/hw/touchscreen/CMakeLists.txt index c9de46a..dbfa733 100644 --- a/hw/touchscreen/CMakeLists.txt +++ b/hw/touchscreen/CMakeLists.txt @@ -17,4 +17,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_LIBRARY(${PROJECT_NAME} MODULE touchscreen.c) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hal-backend-device-touchscreen_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-sc7730.spec b/packaging/device-manager-plugin-sc7730.spec index d2c19d4..db7e9cd 100644 --- a/packaging/device-manager-plugin-sc7730.spec +++ b/packaging/device-manager-plugin-sc7730.spec @@ -27,7 +27,9 @@ cp %{SOURCE1} . %build %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DENABLE_DLOG=on \ + -DHAL_LIB_DIR=%{_hal_libdir} \ + -DHAL_LICENSE_DIR=%{_hal_licensedir} \ + -DENABLE_DLOG=on make %{?jobs:-j%jobs} @@ -44,7 +46,7 @@ install -m 644 rules/61-video.rules %{buildroot}%{_prefix}/lib/udev/rules.d %postun -p /sbin/ldconfig %files -/hal/lib/*.so* +%{_hal_libdir}/*.so* %manifest %{name}.manifest -%license LICENSE.Apache-2.0 +%{_hal_licensedir}/%{name}/LICENSE.Apache-2.0 %{_prefix}/lib/udev/rules.d/61-video.rules |