Cleanup dependencies

Don't link with libraries already linked by common library.
Make all common include dirs PUBLIC so test binaries know where to look
for headers.

Change-Id: Iab79f69fc6627b002f191d47b4b89bb47d60ea35

diff --git a/src/ckm-integration/CMakeLists.txt b/src/ckm-integration/CMakeLists.txt
index 54bc1a5bfaa1efb8fd7dcf783795db2c15a18924..69e8868727513fbbd81f0e1ff31b0ba90eadec83 100644 (file)
--- a/src/ckm-integration/CMakeLists.txt
+++ b/src/ckm-integration/CMakeLists.txt
@@ -21,11 +21,6 @@ INCLUDE(FindPkgConfig)
 
 PKG_CHECK_MODULES(CKMI_DEP
     REQUIRED
-    libsmack
-    libgum
-    key-manager
-    security-manager
-    dbus-1
     vconf
 )
 

diff --git a/src/ckm/CMakeLists.txt b/src/ckm/CMakeLists.txt
index 0a4c175a873fdb5a174c2e864d271418e5d984ba..43296c20b6b9d33e8c04d6142f14e42ad3191be7 100644 (file)
--- a/src/ckm/CMakeLists.txt
+++ b/src/ckm/CMakeLists.txt
@@ -34,7 +34,6 @@ PKG_CHECK_MODULES(CKM_TEST_COMMON_DEP
     REQUIRED
     openssl1.1
     key-manager>=0.1.49
-    libtzplatform-config
 )
 
 SET(CKM_TEST_COMMON_SRCS

diff --git a/src/ckm/privileged/CMakeLists.txt b/src/ckm/privileged/CMakeLists.txt
index ee8ce0b7f88ee07a8afa3debca850b1b6f47e025..80d21827aaad14bf8edb29da55f34b97cdf2dc9c 100644 (file)
--- a/src/ckm/privileged/CMakeLists.txt
+++ b/src/ckm/privileged/CMakeLists.txt
@@ -75,12 +75,6 @@ ADD_CUSTOM_TARGET(TARGET_EIV_TEST_XML DEPENDS ${EIV_FILES})
 
 INSTALL(FILES ${EIV_FILES} DESTINATION ${CKM_TEST_DIR})
 
-# ckm-tests
-PKG_CHECK_MODULES(CKM_DEP
-    REQUIRED
-    libsmack
-    dbus-1
-)
 
 SET(CKM_SOURCES
     async-api.cpp
@@ -92,7 +86,6 @@ SET(CKM_SOURCES
     system-db.cpp
 )
 
-INCLUDE_DIRECTORIES(SYSTEM ${CKM_DEP_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(
     ${PROJECT_SOURCE_DIR}/src/common
     ..
@@ -105,7 +98,6 @@ ADD_DEPENDENCIES(${TARGET_CKM_PRIVILEGED_TESTS} TARGET_EIV_TEST_XML)
 
 TARGET_LINK_LIBRARIES(${TARGET_CKM_PRIVILEGED_TESTS}
     ${TARGET_CKM_TEST_COMMON}
-    ${CKM_DEP_LIBRARIES}
     ${COMMON_TARGET_TEST}
 )
 

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 28b21057758db5f25609fbbc9e8e1025e20a7263..f4ba8b655039bfd183b53e46b896b63bcb7591b1 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -56,18 +56,17 @@ SET(COMMON_TARGET_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/src/common/scoped_app_launcher.cpp
     )
 
+#output OBJECT format
+ADD_LIBRARY(${COMMON_TARGET_TEST} ${COMMON_TARGET_TEST_SOURCES})
+
 #system and local includes
-INCLUDE_DIRECTORIES(SYSTEM ${COMMON_TARGET_DEP_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${COMMON_TARGET_TEST} SYSTEM PUBLIC ${COMMON_TARGET_DEP_INCLUDE_DIRS})
 
-INCLUDE_DIRECTORIES(
+TARGET_INCLUDE_DIRECTORIES(${COMMON_TARGET_TEST} PRIVATE
     ${PROJECT_SOURCE_DIR}/src/framework/include
     ${PROJECT_SOURCE_DIR}/src/common
     )
 
-
-#output OBJECT format
-ADD_LIBRARY(${COMMON_TARGET_TEST} ${COMMON_TARGET_TEST_SOURCES})
-
 TARGET_LINK_LIBRARIES(${COMMON_TARGET_TEST} ${COMMON_TARGET_DEP_LIBRARIES}
     dpl-test-framework)
 

diff --git a/src/cynara-tests/CMakeLists.txt b/src/cynara-tests/CMakeLists.txt
index e39ab3bd4466b57aa4ce154d7f3106d9e63c27a6..39c9eaf0cb391a69acb9d0d7497256769f1ecace 100644 (file)
--- a/src/cynara-tests/CMakeLists.txt
+++ b/src/cynara-tests/CMakeLists.txt
@@ -24,15 +24,9 @@ PKG_CHECK_MODULES(CYNARA_TARGET_DEP
     cynara-agent
     cynara-client
     cynara-client-async
-    cynara-creds-dbus
-    cynara-creds-gdbus
-    cynara-creds-sd-bus
     cynara-creds-self
-    cynara-creds-socket
     cynara-monitor
     cynara-plugin
-    dbus-1
-    glib-2.0
     libsystemd
     )
 FIND_PACKAGE (Threads)

diff --git a/src/security-manager-tests/CMakeLists.txt b/src/security-manager-tests/CMakeLists.txt
index 3550e0af87dcef833d6dabe2328aa5ddb7452be6..dacd346da5fdb88e5d529ab3d15e756c5ed18ab7 100644 (file)
--- a/src/security-manager-tests/CMakeLists.txt
+++ b/src/security-manager-tests/CMakeLists.txt
@@ -27,15 +27,8 @@ INCLUDE(FindPkgConfig)
 # Dependencies
 PKG_CHECK_MODULES(SEC_MGR_TESTS_DEP
     REQUIRED
-    libsmack
     cynara-client
     cynara-admin
-    security-manager
-    security-privilege-manager
-    libtzplatform-config
-    sqlite3
-    dbus-1
-    libgum
     boost)