sensord: clean CMakeList.txt

- remove useless code/macro
- for building on x86_64, use macro CMAKE_INSTALL_* in GNUInstallDirs

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aae422..9ecff83 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,54 +1,42 @@
 cmake_minimum_required(VERSION 2.6)
 project(sensord_main CXX)
+include(GNUInstallDirs)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED glib-2.0 gio-2.0 vconf dlog libxml-2.0 libsystemd-daemon capi-system-info)
-add_definitions(${rpkgs_CFLAGS})
-
-# to install pkgconfig setup file.
+# Setup For pkgconfig File
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
+SET(EXEC_PREFIX "${PREFIX}/bin")
+SET(LIBDIR "${PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+SET(INCLUDEDIR "${PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
 SET(VERSION 1.0)
 
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "2")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-add_definitions(-Wall -O3 -omit-frame-pointer)
+# Common Options
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2 -omit-frame-pointer -std=gnu++0x")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-section -Wl,--print-gc-section")
+MESSAGE("FLAGS: ${CMAKE_CXX_FLAGS}")
+MESSAGE("FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
+
 add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-DLIBDIR="${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")
+        ADD_DEFINITIONS("-DTARGET")
+        MESSAGE("add -DTARGET")
 ELSE("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DSIMULATOR")
-       MESSAGE("add -DSIMULATOR")
+        ADD_DEFINITIONS("-DSIMULATOR")
+        MESSAGE("add -DSIMULATOR")
 ENDIF("${ARCH}" MATCHES "^arm.*")
 
-IF("${ARCH}" MATCHES "^arm.*")
-       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
-               virtual_sensors.xml
-               DESTINATION etc)
-ELSE("${ARCH}" MATCHES "^arm.*")
-       CONFIGURE_FILE(sensor_plugins_sim.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
-               virtual_sensors.xml
-               DESTINATION etc)
-ENDIF("${ARCH}" MATCHES "^arm.*")
+# Installing files
+CONFIGURE_FILE(sensor_plugins.xml.in sensor_plugins.xml @ONLY)
+CONFIGURE_FILE(sensors.xml.in sensors.xml @ONLY)
 
+INSTALL(FILES sensor_plugins.xml 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)
 
@@ -56,6 +44,7 @@ IF("${TEST_SUITE}" STREQUAL "ON")
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME test)
 ENDIF()
 
+# Sub-directory
 add_subdirectory(systemd)
 add_subdirectory(src)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff35867..984f729 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,28 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 project(sensord_src CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 include_directories(${CMAKE_SOURCE_DIR}/src/shared)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED glib-2.0 gio-2.0 vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE)
-add_definitions(-Wall -std=gnu++0x)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
-set(SENSOR_FUSION_ENABLE "0")
-set(ORIENTATION_ENABLE "0")
-set(GRAVITY_ENABLE "0")
-set(LINEAR_ACCELERATION_ENABLE "0")
-
 IF("${ACCEL}" STREQUAL "ON")
 add_subdirectory(accel)
 ENDIF()

diff --git a/src/accel/CMakeLists.txt b/src/accel/CMakeLists.txt
index 948d42a..a37c89c 100755 (executable)
--- a/src/accel/CMakeLists.txt
+++ b/src/accel/CMakeLists.txt
@@ -1,39 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(accel CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME accel_sensor)
 SET(SENSOR_HAL_NAME accel_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-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)
-add_definitions(-Iinclude)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(accel_pkgs REQUIRED vconf)
+
+FOREACH(flag ${accel_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+FOREACH(flag ${accel_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                accel_sensor.cpp
@@ -43,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                accel_sensor_hal.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${accel_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${accel_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt
index e089fbe..c6d4aa1 100755 (executable)
--- a/src/geo/CMakeLists.txt
+++ b/src/geo/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(geo CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME geo_sensor)
 SET(SENSOR_HAL_NAME geo_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(geo_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${geo_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-add_definitions(-DUSE_DLOG_LOG)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-Iinclude)
+FOREACH(flag ${geo_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                geo_sensor.cpp
@@ -44,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                geo_sensor_hal.cpp
 )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${geo_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${geo_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/gravity/CMakeLists.txt b/src/gravity/CMakeLists.txt
index 42cf604..e66964e 100755 (executable)
--- a/src/gravity/CMakeLists.txt
+++ b/src/gravity/CMakeLists.txt
@@ -1,42 +1,26 @@
 cmake_minimum_required(VERSION 2.6)
 project(gravity CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME gravity_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-
-set(PROJECT_MAJOR_VERSION "0")
-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)
-add_definitions(-Iinclude)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(gravity_pkgs REQUIRED vconf)
+
+FOREACH(flag ${gravity_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+FOREACH(flag ${gravity_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                gravity_sensor.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_NAME} ${gravity_pkgs_LDFLAGS} "-lm")
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/gyro/CMakeLists.txt b/src/gyro/CMakeLists.txt
index b8af818..228fac9 100755 (executable)
--- a/src/gyro/CMakeLists.txt
+++ b/src/gyro/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(gyro CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME gyro_sensor)
 SET(SENSOR_HAL_NAME gyro_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(gyro_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${gyro_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${gyro_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                gyro_sensor.cpp
@@ -43,8 +25,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                gyro_sensor_hal.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${gyro_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${gyro_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt
index 81f759f..5a59254 100755 (executable)
--- a/src/libsensord/CMakeLists.txt
+++ b/src/libsensord/CMakeLists.txt
@@ -1,33 +1,21 @@
 cmake_minimum_required(VERSION 2.6)
 project(sensor CXX)
 
-# to install pkgconfig setup file.
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
 SET(VERSION_MAJOR 1)
 SET(VERSION "${VERSION_MAJOR}.1.0")
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf glib-2.0)
-add_definitions(${rpkgs_CFLAGS})
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(lib_pkgs REQUIRED vconf glib-2.0)
 
-#add_definitions(-Wall -O3 -omit-frame-pointer -lm)
-#add_definitions(-Wall -g -lma -DUSE_FILE_DEBUG)
-#add_definitions(-D_DEBUG)
-add_definitions(-Wall -g -lma -fPIC -DUSE_DLOG_LOG -std=c++0x)
-#add_definitions(-fvisibility=hidden -lm -DUSE_DLOG_LOG)
-#add_definitions(-fvisibility=hidden -lm)
+FOREACH(flag ${lib_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" STREQUAL "arm")
-#        ADD_DEFINITIONS("-DTARGET -DHWREV_CHECK -DUSE_MPU3050_GYRO")
-       ADD_DEFINITIONS("-DTARGET -DHWREV_CHECK")
-        MESSAGE("add -DTARGET")
-ELSE("${ARCH}" STREQUAL "arm")
-        ADD_DEFINITIONS("-DSIMULATOR")
-        MESSAGE("add -DSIMULATOR")
-ENDIF("${ARCH}" STREQUAL "arm")
+FOREACH(flag ${lib_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -g -fPIC")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -41,35 +29,32 @@ add_library(${PROJECT_NAME} SHARED
        poller.cpp
 )
 
-target_link_libraries(${PROJECT_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "sensord-share")
+target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-share")
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
-
-#install(DIRECTORY include/ DESTINATION ${INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
-install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
-
-install(FILES sensor.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_internal_deprecated.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_internal.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES poller.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES creg_event_info.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES csensor_event_listener.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_info_manager.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES csensor_handle_info.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES client_common.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_accel.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_geomag.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_light.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_proxi.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_gyro.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_pressure.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_context.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_gravity.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_linear_accel.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_orientation.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_rv.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_temperature.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES sensor_motion.h DESTINATION ${INCLUDEDIR}/sensor/)
-install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
+install(FILES sensor.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES poller.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES creg_event_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES csensor_event_listener.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_info_manager.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES csensor_handle_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES client_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_geomag.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_light.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_proxi.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_gyro.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_pressure.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_context.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_gravity.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_linear_accel.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_orientation.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

diff --git a/src/light/CMakeLists.txt b/src/light/CMakeLists.txt
index ca8cd53..099ff82 100755 (executable)
--- a/src/light/CMakeLists.txt
+++ b/src/light/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(light CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME light_sensor)
 SET(SENSOR_HAL_NAME light_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(light_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${light_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${light_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                light_sensor.cpp
@@ -44,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                light_sensor_hal.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${light_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${light_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/linear_accel/CMakeLists.txt b/src/linear_accel/CMakeLists.txt
index 2295b67..986fb11 100755 (executable)
--- a/src/linear_accel/CMakeLists.txt
+++ b/src/linear_accel/CMakeLists.txt
@@ -1,44 +1,27 @@
 cmake_minimum_required(VERSION 2.6)
 project(linear_accel CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME linear_accel_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(linear_accel_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${linear_accel_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${linear_accel_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                linear_accel_sensor.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_NAME} ${linear_accel_pkgs_LDFLAGS} "-lm")
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/orientation/CMakeLists.txt b/src/orientation/CMakeLists.txt
index 0896f56..6f02e9a 100755 (executable)
--- a/src/orientation/CMakeLists.txt
+++ b/src/orientation/CMakeLists.txt
@@ -1,44 +1,27 @@
 cmake_minimum_required(VERSION 2.6)
 project(orientation CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME orientation_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(orientation_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${orientation_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${orientation_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                orientation_sensor.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_NAME} ${orientation_pkgs_LDFLAGS} "-lm")
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/pressure/CMakeLists.txt b/src/pressure/CMakeLists.txt
index 090d748..e61aca4 100755 (executable)
--- a/src/pressure/CMakeLists.txt
+++ b/src/pressure/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(pressure CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME pressure_sensor)
 SET(SENSOR_HAL_NAME pressure_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(pressure_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${pressure_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${pressure_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                pressure_sensor.cpp
@@ -44,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                pressure_sensor_hal.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${pressure_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${pressure_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/proxi/CMakeLists.txt b/src/proxi/CMakeLists.txt
index d41eb8d..7cd4517 100755 (executable)
--- a/src/proxi/CMakeLists.txt
+++ b/src/proxi/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(proxi CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME proxi_sensor)
 SET(SENSOR_HAL_NAME proxi_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(proxi_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${proxi_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${proxi_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
        proxi_sensor.cpp
@@ -44,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
         proxi_sensor_hal.cpp
 )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${proxi_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${proxi_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/rotation_vector/rv/CMakeLists.txt b/src/rotation_vector/rv/CMakeLists.txt
index 33ac289..d26d4f9 100755 (executable)
--- a/src/rotation_vector/rv/CMakeLists.txt
+++ b/src/rotation_vector/rv/CMakeLists.txt
@@ -1,47 +1,27 @@
 cmake_minimum_required(VERSION 2.6)
 project(rv CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME rv_sensor)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 include_directories(${CMAKE_SOURCE_DIR}/src/sensor_fusion)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(rv_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${rv_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-add_definitions(-DUSE_DLOG_LOG)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-Iinclude)
+FOREACH(flag ${rv_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                rv_sensor.cpp
 )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_NAME} ${rv_pkgs_LDFLAGS} "-lm")
 
-install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt
index 0a753db..2505fe5 100755 (executable)
--- a/src/sensor_fusion/CMakeLists.txt
+++ b/src/sensor_fusion/CMakeLists.txt
@@ -45,4 +45,4 @@ add_library(${SENSOR_FUSION_NAME} SHARED
 
 target_link_libraries(${SENSOR_FUSION_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
 
-install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 88e83da..2b01530 100755 (executable)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,14 +1,23 @@
 cmake_minimum_required(VERSION 2.6)
 project(sensord CXX)
 
-#add_definitions(-Wall -g -DUSE_FILE_DEBUG)
-#add_definitions(-Wall -g -D_DEBUG)
-#add_definitions(-Wall -g -pg)
-add_definitions(-Wall -std=gnu++0x)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(server_pkgs REQUIRED vconf glib-2.0 gio-2.0 dlog libsystemd-daemon)
+
+FOREACH(flag ${server_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+FOREACH(flag ${server_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lrt -ldl -pthread -fPIE")
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+
 SET(SERVER_SRCS
        dbus_util.cpp
        server.cpp
@@ -18,7 +27,6 @@ SET(SERVER_SRCS
 
 add_executable(${PROJECT_NAME} ${SERVER_SRCS})
 
-target_link_libraries(${PROJECT_NAME} ${rpkgs_LDFLAGS} "sensord-server")
-set(CMAKE_CXX_FLAGS "-lrt -ldl -pthread ${CMAKE_CXX_FLAGS}")
+target_link_libraries(${PROJECT_NAME} ${server_pkgs_LDFLAGS} "sensord-server")
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 8c5d1c8..f400944 100755 (executable)
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,34 +1,18 @@
 cmake_minimum_required(VERSION 2.6)
 project(sf_common CXX)
-# to install pkgconfig setup file.
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
 
-#set(CMAKE_INSTALL_PREFIX "$ENV{DATAFS}")
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "2")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(shared_pkgs REQUIRED vconf dlog libxml-2.0)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED dlog libxml-2.0)
-add_definitions(${rpkgs_CFLAGS})
+FOREACH(flag ${shared_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
-add_definitions(-DLOCALEDIR="$ENV{DATAFS}/share/locale")
-add_definitions(-DFACTORYFS="$ENV{FACTORYFS}")
-add_definitions(-DDATAFS="$ENV{DATAFS}")
-add_definitions(-Wall -fPIC -std=gnu++0x)
-add_definitions(-DUSE_DLOG_LOG)
-#add_definitions(-DX1_PROF)
-#add_definitions(-D_GETTEXT)
-#add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-D_DEFAULT_FONT_NAME="Vera")
-#add_definitions(-Wall -g -DUSE_FILE_DEBUG)
-#add_definitions(-Wall -g -D_DEBUG)
-#add_definitions(-Wl,--as-needed -Wl,-O1)
-#add_definitions(-finstrument-functions)
+FOREACH(flag ${shared_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
@@ -62,15 +46,15 @@ add_library(sensord-share SHARED
        sensor_info.cpp
 )
 
-target_link_libraries(sensord-server ${rpkgs_LDFLAGS} "-lrt -ldl -pthread" "sensord-share")
-target_link_libraries(sensord-share ${rpkgs_LDFLAGS} "-lrt -ldl -pthread")
+target_link_libraries(sensord-server ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread" "sensord-share")
+target_link_libraries(sensord-share ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread")
 configure_file(sensord-server.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/sensord-server.pc @ONLY)
 configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
 
-install(TARGETS sensord-server DESTINATION ${LIBDIR})
-install(TARGETS sensord-share DESTINATION ${LIBDIR})
-install(FILES sensord-server.pc DESTINATION ${LIBDIR}/pkgconfig)
-install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
+install(TARGETS sensord-server DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS sensord-share DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES sensord-server.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 install(FILES
        crw_lock.h
        worker_thread.h
@@ -92,11 +76,11 @@ install(FILES
        common.h
        sensor_info.h
        iio_common.h
-       DESTINATION ${INCLUDEDIR}/${PROJECT_NAME}
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
 )
 
 install(FILES
        sensor_common.h
-       DESTINATION ${INCLUDEDIR}/sensor
+       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor
 )
 

diff --git a/src/temperature/CMakeLists.txt b/src/temperature/CMakeLists.txt
index f67773e..87dab53 100755 (executable)
--- a/src/temperature/CMakeLists.txt
+++ b/src/temperature/CMakeLists.txt
@@ -1,40 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 project(temperature CXX)
 
-# to install pkgconfig setup file.
-SET(EXEC_PREFIX "\${prefix}")
-SET(VERSION 1.0)
-
 SET(SENSOR_NAME temperature_sensor)
 SET(SENSOR_HAL_NAME temperature_sensor_hal)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 
-include(FindPkgConfig)
-pkg_check_modules(rpkgs REQUIRED vconf)
-add_definitions(${rpkgs_CFLAGS} -DUSE_ONLY_ONE_MODULE -DUSE_LCD_TYPE_CHECK)
-
-set(PROJECT_MAJOR_VERSION "0")
-set(PROJECT_MINOR_VERSION "0")
-set(PROJECT_RELEASE_VERSION "1")
-set(CMAKE_VERBOSE_MAKEFILE OFF)
-
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(temp_pkgs REQUIRED vconf)
 
-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.*")
+FOREACH(flag ${temp_pkgs_LDFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
-add_definitions(-Wall -O3 -omit-frame-pointer)
-#add_definitions(-Wall -g -D_DEBUG)
-add_definitions(-DUSE_DLOG_LOG)
-add_definitions(-Iinclude)
+FOREACH(flag ${temp_pkgs_CFLAGS})
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
 
 add_library(${SENSOR_NAME} SHARED
                temperature_sensor.cpp
@@ -44,8 +26,8 @@ add_library(${SENSOR_HAL_NAME} SHARED
                temperature_sensor_hal.cpp
                )
 
-target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
-target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS})
+target_link_libraries(${SENSOR_NAME} ${temp_pkgs_LDFLAGS} "-lm")
+target_link_libraries(${SENSOR_HAL_NAME} ${temp_pkgs_LDFLAGS})
 
-install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)