From 57f3e3373f246eb8bb1afc33e538d2870230f978 Mon Sep 17 00:00:00 2001 From: Ramasamy Date: Fri, 6 Nov 2015 21:25:08 +0900 Subject: [PATCH] Fixing Cmakelist and spec issues - Fixing issues in cmake and spec files after restructuring Change-Id: I3a5bb8c74d2af6d24539ead4b7e5c411ca4ca0e3 --- packaging/sensord.spec | 15 ++++----- src/client/CMakeLists.txt | 2 +- src/server/CMakeLists.txt | 39 +++++----------------- src/shared/CMakeLists.txt | 9 ++--- .../{sf_common.pc.in => sensord-devel.pc.in} | 0 5 files changed, 21 insertions(+), 44 deletions(-) rename src/shared/{sf_common.pc.in => sensord-devel.pc.in} (100%) diff --git a/packaging/sensord.spec b/packaging/sensord.spec index ed87346..32c53ac 100644 --- a/packaging/sensord.spec +++ b/packaging/sensord.spec @@ -28,7 +28,7 @@ BuildRequires: pkgconfig(cynara-session) %define geo_state ON %define pressure_state ON %define temperature_state ON -%define ultraviolet_state OFF +%define ultraviolet_state ON %define orientation_state ON %define gravity_state ON %define linear_accel_state ON @@ -37,7 +37,7 @@ BuildRequires: pkgconfig(cynara-session) %define gaming_rv_state ON %define tilt_state ON %define uncal_gyro_state ON -%define bio_led_red_state OFF +%define bio_led_red_state ON %define build_test_suite OFF %description @@ -60,12 +60,12 @@ Requires: %{name} = %{version}-%{release} Sensord library %package -n libsensord-devel -Summary: Sensord library (devel) +Summary: Sensord shared library Group: System/Development Requires: %{name} = %{version}-%{release} %description -n libsensord-devel -Sensord library (devel) +Sensord shared library %if %{build_test_suite} == "ON" %package -n sensor-test @@ -130,17 +130,16 @@ systemctl daemon-reload %manifest libsensord.manifest %{_libdir}/libsensor.so.* %{_libdir}/sensord/*.so* -%{_libdir}/libsensord-share.so -%{_libdir}/libsensord-server.so +%{_libdir}/libsensord-devel.so %license LICENSE.APLv2 %files -n libsensord-devel %defattr(-,root,root,-) %{_includedir}/sensor/*.h -%{_includedir}/sf_common/*.h +%{_includedir}/sensord-devel/*.h %{_libdir}/libsensor.so %{_libdir}/pkgconfig/sensor.pc -%{_libdir}/pkgconfig/sf_common.pc +%{_libdir}/pkgconfig/sensord-devel.pc %{_libdir}/pkgconfig/sensord-server.pc %license LICENSE.APLv2 diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 3f989c8..edc1f1d 100755 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(${PROJECT_NAME} SHARED poller.cpp ) -target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-share") +target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index f751ecc..7cbdbf9 100755 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -3,6 +3,10 @@ project(sensord CXX) INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(server_pkgs REQUIRED glib-2.0 gio-2.0 dlog libsystemd-daemon libxml-2.0 cynara-client cynara-creds-socket cynara-session) + +INCLUDE_DIRECTORIES(include) +FILE(GLOB SERVER_SRCS *.c *.cpp) + FOREACH(flag ${server_pkgs_LDFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") ENDFOREACH(flag) @@ -13,46 +17,19 @@ ENDFOREACH(flag) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/client) +include_directories(${CMAKE_SOURCE_DIR}/src/shared) 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 - command_worker.cpp - permission_checker.cpp - main.cpp +add_executable(${PROJECT_NAME} ${SERVER_SRCS}) -) +target_link_libraries(${PROJECT_NAME} ${lib_pkgs_LDFLAGS} "sensord-devel") -add_library(sensord-server SHARED - worker_thread.cpp - cvirtual_sensor_config.cpp - csensor_event_queue.cpp - csensor_event_dispatcher.cpp - csensor_usage.cpp - cplugin_info_list.cpp - sensor_plugin_loader.cpp - sensor_base.cpp - physical_sensor.cpp - virtual_sensor.cpp - cclient_info_manager.cpp - cclient_sensor_record.cpp - cconfig.cpp -) -target_link_libraries(sensord-server ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread" "sensord-share") configure_file(sensord-server.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/sensord-server.pc @ONLY) -install(TARGETS sensord-server DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(FILES sensord-server.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - -add_executable(${PROJECT_NAME} ${SERVER_SRCS}) - -target_link_libraries(${PROJECT_NAME} ${server_pkgs_LDFLAGS} "sensord-server") install(TARGETS ${PROJECT_NAME} DESTINATION bin) - - +install(FILES sensord-server.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) IF("${ACCEL}" STREQUAL "ON") add_subdirectory(plugins/accel) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 41f824f..a44bce0 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project(sf_common CXX) +project(sensord-devel CXX) INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(shared_pkgs REQUIRED dlog libxml-2.0) @@ -18,7 +18,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/src/client) -add_library(sensord-share SHARED +add_library(${PROJECT_NAME} SHARED cbase_lock.cpp cmutex.cpp cpacket.cpp @@ -28,12 +28,12 @@ add_library(sensord-share SHARED ) -target_link_libraries(sensord-share ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread") +target_link_libraries(${PROJECT_NAME} ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread") configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY) -install(TARGETS sensord-share DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES @@ -49,4 +49,5 @@ install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor install(FILES sensor_types.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 sensor_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) diff --git a/src/shared/sf_common.pc.in b/src/shared/sensord-devel.pc.in similarity index 100% rename from src/shared/sf_common.pc.in rename to src/shared/sensord-devel.pc.in -- 2.7.4