X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=21946dd48e1fae7e19ac084817785ded8bdcddba;hb=d6606535ac51bb3e574312106088f3f15843536e;hp=d6fed0df9f911d11986c92e0faac41e2f5212162;hpb=05f80905c970d8cb8b2f8ed80c82e65393f9322e;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6fed0d..21946dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,33 +1,3 @@
-IF (DEFINED WATCHDOG_ENABLED)
-SET(EXTRA_KM_DEPS argos_watchdog)
-ELSE (DEFINED WATCHDOG_ENABLED)
-SET(EXTRA_KM_DEPS)
-ENDIF (DEFINED WATCHDOG_ENABLED)
-
-IF (TZ_BACKEND_ENABLED)
-SET(EXTRA_KM_DEPS
-    ${EXTRA_KM_DEPS}
-    tef-libteec
-    )
-ENDIF()
-
-PKG_CHECK_MODULES(KEY_MANAGER_DEP
-    REQUIRED
-    dlog
-    glib-2.0
-    openssl1.1
-    libsmack
-    libsystemd-daemon
-    capi-base-common
-    capi-system-info
-    libxml-2.0
-    security-manager
-    cynara-client-async
-    cynara-creds-socket
-    pkgmgr
-    vconf
-    ${EXTRA_KM_DEPS}
-    )
 FIND_PACKAGE(Threads REQUIRED)
 
 SET(KEY_MANAGER_SRC_PATH ${PROJECT_SOURCE_DIR}/src)
@@ -73,30 +43,19 @@ SET(KEY_MANAGER_SOURCES
     ${KEY_MANAGER_PATH}/initial-values/NoCharactersHandler.cpp
     ${KEY_MANAGER_PATH}/initial-values/xml-utils.cpp
     ${KEY_MANAGER_PATH}/initial-values/initial-value-loader.cpp
-    ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp
     ${KEY_MANAGER_PATH}/dpl/db/src/sql_connection.cpp
     ${KEY_MANAGER_PATH}/dpl/db/src/naive_synchronization_object.cpp
-    ${KEY_MANAGER_PATH}/sqlcipher/sqlcipher.c
     ${KEY_MANAGER_PATH}/crypto/sw-backend/obj.cpp
     ${KEY_MANAGER_PATH}/crypto/sw-backend/internals.cpp
     ${KEY_MANAGER_PATH}/crypto/sw-backend/store.cpp
+    ${KEY_MANAGER_PATH}/crypto/sw-backend/kbkdf.cpp
     ${KEY_MANAGER_PATH}/crypto/platform/decider.cpp
     ${SECURITY_MANAGER_WRAPPER_PATH}
     ${CYNARA_WRAPPER_PATH}
+    ${TZ_BACKEND_SOURCES}
+    ${SE_BACKEND_SOURCES}
     )
 
-IF(TZ_BACKEND_ENABLED)
-SET(KEY_MANAGER_SOURCES
-    ${KEY_MANAGER_SOURCES}
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/store.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/internals.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-context.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-memory.cpp
-    ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-serializer.cpp
-    )
-ENDIF()
-
 SET_SOURCE_FILES_PROPERTIES(
     ${KEY_MANAGER_SOURCES}
     PROPERTIES
@@ -108,11 +67,11 @@ INCLUDE_DIRECTORIES(SYSTEM
 
 INCLUDE_DIRECTORIES(
     ${KEY_MANAGER_SRC_PATH}/include
+    ${PROJECT_SOURCE_DIR}/common
     ${KEY_MANAGER_PATH}/main
     ${KEY_MANAGER_PATH}/common
     ${KEY_MANAGER_PATH}/service
     ${KEY_MANAGER_PATH}/initial-values
-    ${KEY_MANAGER_PATH}/sqlcipher
     ${KEY_MANAGER_PATH}/dpl/core/include
     ${KEY_MANAGER_PATH}/dpl/log/include
     ${KEY_MANAGER_PATH}/dpl/db/include
@@ -123,13 +82,6 @@ LINK_DIRECTORIES(${KEY_MANAGER_DEP_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES})
 
-IF(TZ_BACKEND_ENABLED)
-SET(KM_LINK_EXTRA_DEPS
-    ${KM_LINK_EXTRA_DEPS}
-    km_serialization
-    )
-ENDIF()
-
 TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER}
     ${CMAKE_THREAD_LIBS_INIT}
     ${KEY_MANAGER_DEP_LIBRARIES}
@@ -216,7 +168,7 @@ ADD_LIBRARY(${TARGET_KEY_MANAGER_CONTROL_CLIENT} SHARED ${KEY_MANAGER_CONTROL_CL
 SET_TARGET_PROPERTIES(
     ${TARGET_KEY_MANAGER_CONTROL_CLIENT}
     PROPERTIES
-        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden  -Wno-deprecated-declarations"
+        COMPILE_FLAGS "-D_GNU_SOURCE -fvisibility=hidden -Wno-deprecated-declarations"
         SOVERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION_MAJOR}
         VERSION ${KEY_MANAGER_CONTROL_CLIENT_VERSION}
     )
@@ -256,5 +208,10 @@ INSTALL(FILES
     )
 ################################################################################
 
+CONFIGURE_FILE(
+    ${PROJECT_SOURCE_DIR}/packaging/key-manager.manifest.in
+    ${PROJECT_SOURCE_DIR}/key-manager.manifest @ONLY
+)
+
 ADD_SUBDIRECTORY(manager)
 ADD_SUBDIRECTORY(pam_plugin)