Add new package with common library

[platform/core/security/key-manager.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e3dabac..943bb27 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@ PKG_CHECK_MODULES(KEY_MANAGER_DEP
     db-util
     REQUIRED
     )
+FIND_PACKAGE(Threads REQUIRED)
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
 SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
@@ -52,9 +53,9 @@ INCLUDE_DIRECTORIES(
 ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES})
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
+    ${CMAKE_THREAD_LIBS_INIT}
     ${KEY_MANAGER_DEP_LIBRARIES}
     ${TARGET_KEY_MANAGER_COMMON}
-    ${TARGET_KEY_MANAGER_KEY_PROVIDER}
     )
 
 ################################################################################
@@ -81,27 +82,6 @@ SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-error.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-manager.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
-    ${KEY_MANAGER_PATH}/common/base64.cpp
-    ${KEY_MANAGER_PATH}/common/digest.cpp
-    ${KEY_MANAGER_PATH}/common/protocols.cpp
-    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
-    ${KEY_MANAGER_PATH}/common/smack-check.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
-    ${KEY_MANAGER_PATH}/common/generic-key.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CLIENT} SHARED ${KEY_MANAGER_CLIENT_SOURCES})
@@ -116,6 +96,7 @@ SET_TARGET_PROPERTIES(
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################
@@ -139,27 +120,6 @@ SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-common.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-control.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
-    ${KEY_MANAGER_PATH}/common/base64.cpp
-    ${KEY_MANAGER_PATH}/common/digest.cpp
-    ${KEY_MANAGER_PATH}/common/protocols.cpp
-    ${KEY_MANAGER_PATH}/common/message-buffer.cpp
-    ${KEY_MANAGER_PATH}/common/smack-check.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-impl.cpp
-    ${KEY_MANAGER_PATH}/common/certificate-store.cpp
-    ${KEY_MANAGER_PATH}/common/generic-key.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/abstract_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/dlog_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/log.cpp
-    ${KEY_MANAGER_PATH}/dpl/log/src/old_style_log_provider.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/binary_queue.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/colors.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/exception.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/noncopyable.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/serialization.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/singleton.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/string.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/errno_string.cpp
     )
 
 ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CLIENT_SOURCES})
@@ -174,6 +134,7 @@ SET_TARGET_PROPERTIES(
 
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CONTROL_CLIENT}
     ${KEY_MANAGER_DEP_LIBRARIES}
+    ${TARGET_KEY_MANAGER_COMMON}
     )
 
 ################################################################################
@@ -190,6 +151,7 @@ INSTALL(FILES
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-error.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-key.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-password.h
+    ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-pkcs12.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-raw-buffer.h
     ${KEY_MANAGER_SRC_PATH}/include/ckm/ckm-type.h
     DESTINATION /usr/include/ckm/ckm