sensord: remove unnecessary files in CMakeLists.txt

checking ARM is not necessary because this macro is not used in the
source.

Change-Id: I1ec44abd7670ad61dde1826fbaec023672e6f935
Signed-off-by: Kibak Yoon <kibak.yoon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb4beee..affaa30 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,30 +22,12 @@ add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}")
 # Internal Debugging Options
 #add_definitions(-Wall -g -D_DEBUG)
 
-# For Emulator
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
-        ADD_DEFINITIONS("-DTARGET")
-        MESSAGE("add -DTARGET")
-ELSE("${ARCH}" MATCHES "^arm.*")
-        ADD_DEFINITIONS("-DSIMULATOR")
-        MESSAGE("add -DSIMULATOR")
-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)
-
-IF("${TEST_SUITE}" STREQUAL "ON")
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME test)
-ENDIF()
 
 # Sub-directory
 add_subdirectory(systemd)

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 4289d7b..c097f02 100755 (executable)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -113,7 +113,6 @@ systemctl daemon-reload
 %{_unitdir}/multi-user.target.wants/sensord.service
 %{_unitdir}/sockets.target.wants/sensord.socket
 %license LICENSE.APLv2
-%{_datadir}/license/sensord
 
 %files -n libsensord
 %defattr(-,root,root,-)
@@ -123,7 +122,6 @@ systemctl daemon-reload
 %{_libdir}/libsensord-share.so
 %{_libdir}/libsensord-server.so
 %license LICENSE.APLv2
-%{_datadir}/license/libsensord
 
 %files -n libsensord-devel
 %defattr(-,root,root,-)
@@ -149,6 +147,5 @@ systemctl daemon-reload
 %{_bindir}/light
 %{_bindir}/rotation_vector
 %license LICENSE.APLv2
-%{_datadir}/license/test
 %endif
 

diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt
index 2505fe5..c38f410 100755 (executable)
--- a/src/sensor_fusion/CMakeLists.txt
+++ b/src/sensor_fusion/CMakeLists.txt
@@ -16,16 +16,6 @@ set(PROJECT_MINOR_VERSION "0")
 set(PROJECT_RELEASE_VERSION "1")
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DTARGET -DHWREV_CHECK")
-       MESSAGE("add -DTARGET -DHWREV_CHECK")
-ELSE("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DSIMULATOR")
-       MESSAGE("add -DSIMULATOR")
-ENDIF("${ARCH}" MATCHES "^arm.*")
-
 add_definitions(-Wall -O3 -omit-frame-pointer)
 #add_definitions(-Wall -g -D_DEBUG)
 add_definitions(-DUSE_DLOG_LOG)

diff --git a/virtual_sensors.xml.in b/virtual_sensors.xml
similarity index 100%
rename from virtual_sensors.xml.in
rename to virtual_sensors.xml