Remove cynara dependency from pkgmgr-client

fix comm/CMakeLists.txt

Change-Id: I566283a466947ccf9311b4113329b1916da3f86e
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/comm/CMakeLists.txt b/comm/CMakeLists.txt
index 40a319e..b921408 100644 (file)
--- a/comm/CMakeLists.txt
+++ b/comm/CMakeLists.txt
@@ -25,12 +25,25 @@ message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}")
 ### Get required CFLAGS, LDFLAGS from pkg-config
 
 include(FindPkgConfig)
-pkg_check_modules(comm_pkgs REQUIRED dbus-1 glib-2.0 dbus-glib-1 gio-2.0 gio-unix-2.0 dlog pkgmgr-info db-util cynara-client cynara-creds-dbus cynara-session)
+pkg_check_modules(installer_client_pkgs REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 dlog)
+foreach(flag ${installer_client_pkgs_CFLAGS})
+       set(installer_client_pkgs_CFLAGS_str "${installer_client_pkgs_CFLAGS_str} ${flag}")
+endforeach()
 
+pkg_check_modules(comm_pkgs REQUIRED glib-2.0 dbus-glib-1 dlog cynara-client cynara-creds-dbus cynara-session)
 foreach(flag ${comm_pkgs_CFLAGS})
        set(comm_pkgs_CFLAGS_str "${comm_pkgs_CFLAGS_str} ${flag}")
 endforeach()
 
+pkg_check_modules(broadcast_server_pkgs REQUIRED dbus-1 dlog)
+foreach(flag ${broadcast_server_pkgs_CFLAGS})
+       set(broadcast_server_pkgs_CFLAGS_str "${broadcast_server_pkgs_CFLAGS_str} ${flag}")
+endforeach()
+
+pkg_check_modules(installer_pkgs REQUIRED dbus-1 dlog pkgmgr-info)
+foreach(flag ${installer_pkgs_CFLAGS})
+       set(installer_pkgs_CFLAGS_str "${installer_pkgs_CFLAGS_str} ${flag}")
+endforeach()
 
 ### Set current binary dir to be included (for generated *.h files)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -67,8 +80,8 @@ add_library(pkgmgr_installer_client SHARED
                )
 set_target_properties(pkgmgr_installer_client PROPERTIES SOVERSION ${VERSION_MAJOR})
 set_target_properties(pkgmgr_installer_client PROPERTIES VERSION ${VERSION})
-set_target_properties(pkgmgr_installer_client PROPERTIES COMPILE_FLAGS "${comm_pkgs_CFLAGS_str}")
-target_link_libraries(pkgmgr_installer_client ${comm_pkgs_LDFLAGS})
+set_target_properties(pkgmgr_installer_client PROPERTIES COMPILE_FLAGS "${installer_client_pkgs_CFLAGS_str}")
+target_link_libraries(pkgmgr_installer_client ${installer_client_pkgs_LDFLAGS})
 add_dependencies(pkgmgr_installer_client comm_pkg_mgr_client_gdbus_generated.h comm_pkg_mgr_client_gdbus_generated.c)
 
 ## pkg-mgr server for PMS
@@ -88,8 +101,8 @@ add_library(pkgmgr_installer_status_broadcast_server SHARED
        )
 set_target_properties(pkgmgr_installer_status_broadcast_server PROPERTIES SOVERSION ${VERSION_MAJOR})
 set_target_properties(pkgmgr_installer_status_broadcast_server PROPERTIES VERSION ${VERSION})
-set_target_properties(pkgmgr_installer_status_broadcast_server PROPERTIES COMPILE_FLAGS "${comm_pkgs_CFLAGS_str}")
-target_link_libraries(pkgmgr_installer_status_broadcast_server ${comm_pkgs_LDFLAGS})
+set_target_properties(pkgmgr_installer_status_broadcast_server PROPERTIES COMPILE_FLAGS "${broadcast_server_pkgs_CFLAGS_str}")
+target_link_libraries(pkgmgr_installer_status_broadcast_server ${broadcast_server_pkgs_LDFLAGS})
 add_dependencies(pkgmgr_installer_status_broadcast_server comm_status_broadcast_server_dbus_bindings.h)
 
 
@@ -98,8 +111,8 @@ add_dependencies(pkgmgr_installer_status_broadcast_server comm_status_broadcast_
 add_library(pkgmgr_installer SHARED pkgmgr_installer.c)
 set_target_properties(pkgmgr_installer PROPERTIES SOVERSION ${VERSION_MAJOR})
 set_target_properties(pkgmgr_installer PROPERTIES VERSION ${VERSION})
-set_target_properties(pkgmgr_installer PROPERTIES COMPILE_FLAGS "${comm_pkgs_CFLAGS_str}")
-target_link_libraries(pkgmgr_installer pkgmgr_installer_status_broadcast_server ${comm_pkgs_LDFLAGS})
+set_target_properties(pkgmgr_installer PROPERTIES COMPILE_FLAGS "${installer_pkgs_CFLAGS_str}")
+target_link_libraries(pkgmgr_installer pkgmgr_installer_status_broadcast_server ${installer_pkgs_LDFLAGS})
 
 
 ### Create pc file

diff --git a/comm/comm_client.h b/comm/comm_client.h
index 5cce5e3..c4f7f59 100644 (file)
--- a/comm/comm_client.h
+++ b/comm/comm_client.h
@@ -28,8 +28,6 @@
 #define __COMM_CLIENT_H__
 
 #include "comm_config.h"
-#include <glib.h>
-#include <dbus/dbus-glib.h>
 
 enum {
        COMM_CLIENT_STATUS_CALLBACK_FLAG_NONE = 0,

diff --git a/comm/comm_client_gdbus.c b/comm/comm_client_gdbus.c
index 01f38c8..da76cf7 100644 (file)
--- a/comm/comm_client_gdbus.c
+++ b/comm/comm_client_gdbus.c
@@ -31,6 +31,10 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+
 #include "comm_config.h"
 #include "comm_client.h"
 #include "comm_pkg_mgr_client_gdbus_generated.h"

diff --git a/comm/pkgmgr_installer.c b/comm/pkgmgr_installer.c
index c3d8d6b..8c75a41 100644 (file)
--- a/comm/pkgmgr_installer.c
+++ b/comm/pkgmgr_installer.c
@@ -35,7 +35,6 @@
 #include "comm_debug.h"
 #include "error_report.h"
 
-#include <db-util.h>
 #include <pkgmgr-info.h>
 
 #undef LOG_TAG

diff --git a/comm/test/test_pkgmgr_installer.c b/comm/test/test_pkgmgr_installer.c
index f7753ab..98319eb 100644 (file)
--- a/comm/test/test_pkgmgr_installer.c
+++ b/comm/test/test_pkgmgr_installer.c
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <glib.h>
+
 #include "comm_client.h"
 static int _argc;
 static char **_argv;