From: Kibak Yoon Date: Thu, 18 Dec 2014 12:27:11 +0000 (+0900) Subject: sensord: update for being the compatible with the x32 and x64 X-Git-Tag: submit/tizen/20150113.012540~33^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F32479%2F5;p=platform%2Fcore%2Fsystem%2Fsensord.git sensord: update for being the compatible with the x32 and x64 * replaced "/usr/lib" by %{_libdir} * replaced "/usr/include" by %{_includedir} refered from the below url: https://wiki.tizen.org/wiki/HOW-TO_Build_a_Tizen_distribution_for_x64_arch Signed-off-by: Kibak Yoon Change-Id: I4c57f6ec79754aa20cd103d34e6a00ebfffff42c --- diff --git a/CMakeLists.txt b/CMakeLists.txt index edc7d9b..5381991 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,6 @@ add_definitions(${rpkgs_CFLAGS}) # to install pkgconfig setup file. SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION 1.0) set(PROJECT_MAJOR_VERSION "0") diff --git a/packaging/sensord.spec b/packaging/sensord.spec index 7fed2e6..86e131e 100755 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -81,7 +81,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DACCEL=%{accel_state} \ -DGEO=%{geo_state} -DPRESSURE=%{pressure_state} -DTEMPERATURE=%{temperature_state} \ -DORIENTATION=%{orientation_state} -DGRAVITY=%{gravity_state} \ -DLINEAR_ACCEL=%{linear_accel_state} -DRV=%{rv_state} \ - -DTEST_SUITE=%{build_test_suite} + -DTEST_SUITE=%{build_test_suite} \ + -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} make %{?jobs:-j%jobs} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a55315..ff35867 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,8 +3,6 @@ project(sensord_src CXX) # to install pkgconfig setup file. SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION 1.0) include_directories(${CMAKE_SOURCE_DIR}/src/shared) diff --git a/src/accel/CMakeLists.txt b/src/accel/CMakeLists.txt index 56e9119..948d42a 100755 --- a/src/accel/CMakeLists.txt +++ b/src/accel/CMakeLists.txt @@ -3,8 +3,6 @@ project(accel 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 accel_sensor) @@ -48,5 +46,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt index d011093..e089fbe 100755 --- a/src/geo/CMakeLists.txt +++ b/src/geo/CMakeLists.txt @@ -3,8 +3,6 @@ project(geo 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 geo_sensor) @@ -49,5 +47,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/gravity/CMakeLists.txt b/src/gravity/CMakeLists.txt index 466f54b..42cf604 100755 --- a/src/gravity/CMakeLists.txt +++ b/src/gravity/CMakeLists.txt @@ -3,7 +3,6 @@ project(gravity CXX) # to install pkgconfig setup file. SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(VERSION 1.0) SET(SENSOR_NAME gravity_sensor) @@ -40,4 +39,4 @@ add_library(${SENSOR_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/gyro/CMakeLists.txt b/src/gyro/CMakeLists.txt index afef9f0..b8af818 100755 --- a/src/gyro/CMakeLists.txt +++ b/src/gyro/CMakeLists.txt @@ -3,8 +3,6 @@ project(gyro 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 gyro_sensor) @@ -48,5 +46,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt index 87dac4e..6eccd7b 100755 --- a/src/libsensord/CMakeLists.txt +++ b/src/libsensord/CMakeLists.txt @@ -4,8 +4,6 @@ project(sensor CXX) # to install pkgconfig setup file. SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION_MAJOR 1) SET(VERSION "${VERSION_MAJOR}.1.0") @@ -49,27 +47,27 @@ 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 include/ FILES_MATCHING PATTERN "*.h") -install(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) +#install(DIRECTORY include/ DESTINATION ${INCLUDEDIR} FILES_MATCHING PATTERN "*.h") +install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) -install(FILES sensor_internal_deprecated.h DESTINATION include/sensor/) -install(FILES sensor_internal.h DESTINATION include/sensor/) -install(FILES poller.h DESTINATION include/sensor/) -install(FILES creg_event_info.h DESTINATION include/sensor/) -install(FILES csensor_event_listener.h DESTINATION include/sensor/) -install(FILES sensor_info_manager.h DESTINATION include/sensor/) -install(FILES csensor_handle_info.h DESTINATION include/sensor/) -install(FILES client_common.h DESTINATION include/sensor/) -install(FILES sensor_accel.h DESTINATION include/sensor/) -install(FILES sensor_geomag.h DESTINATION include/sensor/) -install(FILES sensor_light.h DESTINATION include/sensor/) -install(FILES sensor_proxi.h DESTINATION include/sensor/) -install(FILES sensor_gyro.h DESTINATION include/sensor/) -install(FILES sensor_pressure.h DESTINATION include/sensor/) -install(FILES sensor_context.h DESTINATION include/sensor/) -install(FILES sensor_gravity.h DESTINATION include/sensor/) -install(FILES sensor_linear_accel.h DESTINATION include/sensor/) -install(FILES sensor_orientation.h DESTINATION include/sensor/) -install(FILES sensor_rv.h DESTINATION include/sensor/) -install(FILES sensor_temperature.h DESTINATION include/sensor/) -install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +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 ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig) diff --git a/src/light/CMakeLists.txt b/src/light/CMakeLists.txt index e32223b..ca8cd53 100755 --- a/src/light/CMakeLists.txt +++ b/src/light/CMakeLists.txt @@ -3,8 +3,6 @@ project(light 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 light_sensor) @@ -49,5 +47,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/linear_accel/CMakeLists.txt b/src/linear_accel/CMakeLists.txt index 6601d90..2295b67 100755 --- a/src/linear_accel/CMakeLists.txt +++ b/src/linear_accel/CMakeLists.txt @@ -3,7 +3,6 @@ project(linear_accel CXX) # to install pkgconfig setup file. SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(VERSION 1.0) SET(SENSOR_NAME linear_accel_sensor) @@ -42,4 +41,4 @@ add_library(${SENSOR_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/orientation/CMakeLists.txt b/src/orientation/CMakeLists.txt index 2ef7592..0896f56 100755 --- a/src/orientation/CMakeLists.txt +++ b/src/orientation/CMakeLists.txt @@ -3,7 +3,6 @@ project(orientation CXX) # to install pkgconfig setup file. SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(VERSION 1.0) SET(SENSOR_NAME orientation_sensor) @@ -42,4 +41,4 @@ add_library(${SENSOR_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/pressure/CMakeLists.txt b/src/pressure/CMakeLists.txt index ea13698..090d748 100755 --- a/src/pressure/CMakeLists.txt +++ b/src/pressure/CMakeLists.txt @@ -3,8 +3,6 @@ project(pressure 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 pressure_sensor) @@ -49,5 +47,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/proxi/CMakeLists.txt b/src/proxi/CMakeLists.txt index f679e41..d41eb8d 100755 --- a/src/proxi/CMakeLists.txt +++ b/src/proxi/CMakeLists.txt @@ -3,8 +3,6 @@ project(proxi 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 proxi_sensor) @@ -49,5 +47,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt index da05d86..0a753db 100755 --- a/src/sensor_fusion/CMakeLists.txt +++ b/src/sensor_fusion/CMakeLists.txt @@ -3,7 +3,6 @@ project(sensor_fusion CXX) # to install pkgconfig setup file. SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(VERSION 1.0) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -46,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 lib/sensord) +install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 2653782..8c5d1c8 100755 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -3,8 +3,6 @@ project(sf_common CXX) # to install pkgconfig setup file. SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION 1.0) #set(CMAKE_INSTALL_PREFIX "$ENV{DATAFS}") @@ -69,10 +67,10 @@ target_link_libraries(sensord-share ${rpkgs_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 lib) -install(TARGETS sensord-share DESTINATION lib) -install(FILES sensord-server.pc DESTINATION lib/pkgconfig) -install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +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(FILES crw_lock.h worker_thread.h @@ -94,11 +92,11 @@ install(FILES common.h sensor_info.h iio_common.h - DESTINATION include/${PROJECT_NAME} + DESTINATION ${INCLUDEDIR}/${PROJECT_NAME} ) install(FILES sensor_common.h - DESTINATION include/sensor + DESTINATION ${INCLUDEDIR}/sensor ) diff --git a/src/temperature/CMakeLists.txt b/src/temperature/CMakeLists.txt index b8b8392..f67773e 100755 --- a/src/temperature/CMakeLists.txt +++ b/src/temperature/CMakeLists.txt @@ -3,8 +3,6 @@ project(temperature 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 temperature_sensor) @@ -49,5 +47,5 @@ add_library(${SENSOR_HAL_NAME} SHARED target_link_libraries(${SENSOR_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm") target_link_libraries(${SENSOR_HAL_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS}) -install(TARGETS ${SENSOR_NAME} DESTINATION lib/sensord) -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION lib/sensord) +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord) +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ff215c3..6fb5085 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,8 +3,6 @@ project(sensor-tc C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION 1.0) INCLUDE(FindPkgConfig) diff --git a/test/sensor-tc.pc b/test/sensor-tc.pc index 33b2994..c8c0d3c 100644 --- a/test/sensor-tc.pc +++ b/test/sensor-tc.pc @@ -2,7 +2,7 @@ prefix=/usr/bin exec_prefix=${prefix} -libdir=${prefix}/lib +libdir=${prefix}/${_libdir} includedir=${prefix}/include/sensor-tc Name: sensor-tc