Drop unneeded dependency against dbus-glib-1

Change-Id: Id27aa959d0456c873ad3b5178b0f8b77a6d22a47

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index c7523893f7ad2424f91de6a9845df07edcb676f7..78e840cd41987e3abcbf84a0f199c5b1c61e7f2b 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(key-manager)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: pkgconfig(libpcrecpp)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(libiri)

diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt
index c595bf72ff38d23a707a8d0f3db4e8c518165277..35d987d6e472bf626c1b5fd9a3ece1c15bf26850 100644 (file)
--- a/tests/common/CMakeLists.txt
+++ b/tests/common/CMakeLists.txt
@@ -5,13 +5,10 @@ SET(COMMON_TARGET_TEST "tests-common")
 PKG_CHECK_MODULES(COMMON_TARGET_DEP
     libsmack
     dbus-1
-    dbus-glib-1
     sqlite3
     REQUIRED
     )
 
-ADD_DEFINITIONS("-I/usr/include/dbus-1.0/dbus")
-
 #files to compile
 SET(COMMON_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/tests/common/tests_common.cpp

diff --git a/tests/common/dbus_access.h b/tests/common/dbus_access.h
index a3a62a2e2a141f3265b3a18e36f841baec3176c2..f957a7eeca4596aac6930dec53f28f70e7e8de8f 100644 (file)
--- a/tests/common/dbus_access.h
+++ b/tests/common/dbus_access.h
@@ -26,8 +26,6 @@
 #define _DBUS_ACCESS_H_
 
 #include <dbus/dbus.h>
-#include <dbus-glib.h>
-#include <glib-object.h>
 
 #include <set>
 #include <string>

diff --git a/tests/cynara-tests/CMakeLists.txt b/tests/cynara-tests/CMakeLists.txt
index c18dc21be2026ac374a08fa9d73395ebec885a67..c4842cab2540c65c32aadd3f6eeb952a3d101b01 100644 (file)
--- a/tests/cynara-tests/CMakeLists.txt
+++ b/tests/cynara-tests/CMakeLists.txt
@@ -10,7 +10,6 @@ PKG_CHECK_MODULES(CYNARA_TARGET_DEP
     cynara-client
     cynara-client-async
     dbus-1
-    dbus-glib-1
     )
 
 #files to compile
@@ -38,8 +37,6 @@ INCLUDE_DIRECTORIES(
     )
 
 
-ADD_DEFINITIONS("-I/usr/include/dbus-1.0/dbus")
-
 #output format
 ADD_EXECUTABLE(${CYNARA_TARGET_TEST} ${CYNARA_TARGET_TEST_SOURCES})
 

diff --git a/tests/security-server-tests/CMakeLists.txt b/tests/security-server-tests/CMakeLists.txt
index 63401401a9b13c15e3031c9ec9d54a92b0066544..cbf62472a1a2003acdbe4c76ed1f19b09e3f8b6f 100644 (file)
--- a/tests/security-server-tests/CMakeLists.txt
+++ b/tests/security-server-tests/CMakeLists.txt
@@ -28,7 +28,6 @@ PKG_CHECK_MODULES(SEC_SRV_TESTS_DEP
     security-server
     dlog
     dbus-1
-    dbus-glib-1
     REQUIRED)
 
 # Targets definition
@@ -94,8 +93,6 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/common/
    )
 
-ADD_DEFINITIONS("-I/usr/include/dbus-1.0/dbus")
-
 #LINK_DIRECTORIES(${SEC_SRV_PKGS_LIBRARY_DIRS})
 
 ADD_LIBRARY(${TARGET_SEC_SRV_COMMON} STATIC ${SEC_SRV_COMMON_SOURCES})

diff --git a/tests/smack-dbus-tests/CMakeLists.txt b/tests/smack-dbus-tests/CMakeLists.txt
index ed4026d52dadf8e0a0b0dcc78264db81858eb692..6e283c6dcf2dc0dffd0d0c0bbb81ef08169d800c 100644 (file)
--- a/tests/smack-dbus-tests/CMakeLists.txt
+++ b/tests/smack-dbus-tests/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(SMACK_DBUS_TESTS_DEP
     libsmack
     dbus-1
-    dbus-glib-1
     REQUIRED)
 
 # Targets definition
@@ -45,8 +44,6 @@ INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/tests/common/
    )
 
-ADD_DEFINITIONS("-I/usr/include/dbus-1.0")
-
 ADD_EXECUTABLE(${TARGET_SMACK_DBUS_TESTS} ${SMACK_DBUS_SOURCES})
 
 TARGET_LINK_LIBRARIES(${TARGET_SMACK_DBUS_TESTS}