Remove unneeded dependencies from nss plugin

Dlog dependency was replaced by systemd journal on HQ request.

Change-Id: I1dc25f1fbed92cbb61266daf7b096e170d312300

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 642fe2259eba20acf52228b1c89f833e8af56db1..7fd4f20ab970e6b7b9f101a1d33cd04b46d58e65 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,11 +106,6 @@ SET(LOG_TARGET_LIST ${TARGET_SERVER}
                     ${TARGET_CMD}
                     ${TARGET_CLEANUP})
 
-# NSS target doesn't get ANY logs by design in release mode
-IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-    LIST(APPEND ${LOG_TARGET_LIST} ${TARGET_NSS})
-ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-
 FOREACH(TARGET_NAME ${LOG_TARGET_LIST})
     IF(DPL_WITH_DLOG)
         TARGET_COMPILE_DEFINITIONS(${TARGET_NAME} PRIVATE DPL_DLOG_ENABLED)

diff --git a/src/nss/CMakeLists.txt b/src/nss/CMakeLists.txt
index 5216ec2b73f44eaeaaeb197893e85abe18863719..d62b4948d857b50b40653ba658f2fb6c6a270a38 100644 (file)
--- a/src/nss/CMakeLists.txt
+++ b/src/nss/CMakeLists.txt
@@ -3,31 +3,22 @@ SET(NSS_PLUGIN_VERSION ${NSS_PLUGIN_VERSION_MAJOR}.0.0)
 
 SET(LIBRARY_FILE_NAME "nss_securitymanager")
 
-IF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
-    PKG_CHECK_MODULES(NSS_DLOG_DEP REQUIRED dlog libtzplatform-config)
-ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
-
 INCLUDE_DIRECTORIES(
     ${INCLUDE_PATH}
     ${CLIENT_PATH}/include
-    ${NSS_PATH}/include
     ${DPL_PATH}/core/include
     ${DPL_PATH}/log/include
     ${COMMON_PATH}/include
-    ${NSS_DLOG_DEP_INCLUDE_DIRS}
+    ${NSS_DEP_INCLUDE_DIRS}
     )
 
 SET(NSS_SOURCES
     ${NSS_PATH}/nss_securitymanager.cpp
-    ${DPL_PATH}/log/src/abstract_log_provider.cpp
     ${DPL_PATH}/log/src/log.cpp
-    ${DPL_PATH}/log/src/old_style_log_provider.cpp
     ${DPL_PATH}/core/src/assert.cpp
     ${DPL_PATH}/core/src/binary_queue.cpp
-    ${DPL_PATH}/core/src/colors.cpp
     ${DPL_PATH}/core/src/exception.cpp
     ${DPL_PATH}/core/src/noncopyable.cpp
-    ${DPL_PATH}/core/src/serialization.cpp
     ${DPL_PATH}/core/src/errno_string.cpp
     ${COMMON_PATH}/config.cpp
     ${COMMON_PATH}/config-file.cpp
@@ -39,14 +30,23 @@ SET(NSS_SOURCES
     ${CLIENT_PATH}/client-security-manager-internal.cpp
     )
 
-IF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
-    SET(NSS_SOURCES
-        ${NSS_SOURCES}
-        ${DPL_PATH}/log/src/dlog_log_provider.cpp)
-ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG" AND DPL_WITH_DLOG)
+# NSS target doesn't get ANY logs by design in release mode
+IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+    PKG_CHECK_MODULES(NSS_DEP REQUIRED libsystemd)
+
+    SET(NSS_SOURCES ${NSS_SOURCES}
+        ${DPL_PATH}/log/src/abstract_log_provider.cpp
+        ${DPL_PATH}/log/src/old_style_log_provider.cpp
+        ${DPL_PATH}/core/src/colors.cpp
+        ${DPL_PATH}/log/src/sd_journal_provider.cpp)
+ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
 
 ADD_LIBRARY(${TARGET_NSS} SHARED ${NSS_SOURCES})
 
+IF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+    TARGET_COMPILE_DEFINITIONS(${TARGET_NSS} PRIVATE DPL_SYSTEMD_JOURNAL_ENABLED)
+ENDIF(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+
 SET_TARGET_PROPERTIES(${TARGET_NSS}
     PROPERTIES
         OUTPUT_NAME ${LIBRARY_FILE_NAME}
@@ -55,6 +55,6 @@ SET_TARGET_PROPERTIES(${TARGET_NSS}
         VERSION ${NSS_PLUGIN_VERSION}
     )
 
-TARGET_LINK_LIBRARIES(${TARGET_NSS} ${NSS_DLOG_DEP_LIBRARIES} "-z defs")
+TARGET_LINK_LIBRARIES(${TARGET_NSS} ${NSS_DEP_LIBRARIES} "-z defs")
 
 INSTALL(TARGETS ${TARGET_NSS} LIBRARY DESTINATION ${LIB_INSTALL_DIR} NAMELINK_SKIP)