From 46598dfc35a601ad38c8277d35d291b5e1fa9aa2 Mon Sep 17 00:00:00 2001 From: Kibak Yoon Date: Wed, 7 Jan 2015 14:05:17 +0900 Subject: [PATCH] sensord: fix CMakeList.txt for avoiding build-break - define LIBDIR - install virtual_sensors.xml Change-Id: I4b3e65c6a0fa25dbf9e312e744087b4174a21620 Signed-off-by: Kibak Yoon --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ecff83..eb4beee 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ MESSAGE("FLAGS: ${CMAKE_CXX_FLAGS}") MESSAGE("FLAGS: ${CMAKE_EXE_LINKER_FLAGS}") add_definitions(-DUSE_DLOG_LOG) +add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}") # Internal Debugging Options #add_definitions(-Wall -g -D_DEBUG) @@ -35,8 +36,10 @@ ENDIF("${ARCH}" MATCHES "^arm.*") # Installing files CONFIGURE_FILE(sensor_plugins.xml.in sensor_plugins.xml @ONLY) CONFIGURE_FILE(sensors.xml.in sensors.xml @ONLY) +CONFIGURE_FILE(virtual_sensors.xml.in virtual_sensors.xml @ONLY) INSTALL(FILES sensor_plugins.xml sensors.xml DESTINATION etc) +INSTALL(FILES virtual_sensors.xml virtual_sensors.xml DESTINATION etc) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME sensord) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME libsensord) -- 2.7.4