Change-Id: I95653b356fe68d8125262b32b2d21c903d21f85b
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DVERSION=%{version} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
+ -DUNIT_INSTALL_DIR=%{_unitdir} \
%make_install
# Do not execute daemon on boot time
%make_install
# Do not execute daemon on boot time
-#mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-#ln -s %{_libdir}/systemd/system/zigbee-daemon.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
+#mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+#ln -s %{_unitdir}/zigbee-daemon.service %{buildroot}%{_unitdir}/multi-user.target.wants/zigbee-daemon.service
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/
%manifest zigbee-daemon.manifest
%defattr(644,system,system,-)
%attr(755,system,system) %{_bindir}/zigbee-daemon
%manifest zigbee-daemon.manifest
%defattr(644,system,system,-)
%attr(755,system,system) %{_bindir}/zigbee-daemon
-%{_libdir}/systemd/system/zigbee-daemon.service
-#%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service
+%{_unitdir}/zigbee-daemon.service
+#%{_unitdir}/multi-user.target.wants/zigbee-daemon.service
%{_datadir}/license/zigbee-daemon
%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
%if %{CHECK_ZIGBEE_PRIVILEGE} == "True"
%{_datadir}/license/zigbee-daemon
%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
%if %{CHECK_ZIGBEE_PRIVILEGE} == "True"
### Install files ###
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/client)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common)
### Install files ###
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/client)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-client.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-client.pc DESTINATION ${LIBDIR}/pkgconfig)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-client)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-client)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT Runtime)
IF (TIZEN_ENGINEER_MODE)
ADD_SUBDIRECTORY(test_src)
ENDIF (TIZEN_ENGINEER_MODE)
IF (TIZEN_ENGINEER_MODE)
ADD_SUBDIRECTORY(test_src)
ENDIF (TIZEN_ENGINEER_MODE)
prefix=@PREFIX@
exec_prefix=${prefix}
prefix=@PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: ZigBee Client Library
includedir=${prefix}/include
Name: ZigBee Client Library
TARGET_LINK_LIBRARIES(${PROJECT_NAME} zigbee-service zigbee-interface ${pkgs_LDFLAGS} "-ldl")
### Install files ###
TARGET_LINK_LIBRARIES(${PROJECT_NAME} zigbee-service zigbee-interface ${pkgs_LDFLAGS} "-ldl")
### Install files ###
-INSTALL(TARGETS zigbee-lib DESTINATION lib COMPONENT Runtime)
+INSTALL(TARGETS zigbee-lib DESTINATION ${LIBDIR} COMPONENT Runtime)
INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-daemon)
INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-daemon)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION /usr/lib/systemd/system)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION ${UNITDIR})
### Install files ###
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/lib)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common)
### Install files ###
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/lib)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-lib.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-lib.pc DESTINATION ${LIBDIR}/pkgconfig)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-lib)
#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-lib)
#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime)
}
/* Look-up requets_id in request hash table */
}
/* Look-up requets_id in request hash table */
- request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id);
+ request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)GUINT_TO_POINTER(request_id));
if (NULL == request) {
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
if (NULL == request) {
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
}
/* Look-up requets_id in request hash table */
}
/* Look-up requets_id in request hash table */
- request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id);
+ request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)GUINT_TO_POINTER(request_id));
if (NULL == request) {
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
if (NULL == request) {
Z_LOGE("No request available for request_id: [%d]", request_id);
return NULL;
}
/* Insert request to request table */
}
/* Insert request to request table */
- g_hash_table_insert(request_table, (gpointer)(request->request_id), request);
+ g_hash_table_insert(request_table, GINT_TO_POINTER(request->request_id), request);
return request->request_id;
}
return request->request_id;
}
gpointer value, gpointer user_data)
{
ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
gpointer value, gpointer user_data)
{
ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data;
- gint request_id = (gint)key;
+ gint request_id = GPOINTER_TO_INT(key);
prefix=@PREFIX@
exec_prefix=${prefix}
prefix=@PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: lib-zigbee
includedir=${prefix}/include
Name: lib-zigbee