diff options
author | Tomasz Swierczek <t.swierczek@samsung.com> | 2018-04-18 13:25:37 +0200 |
---|---|---|
committer | Tomasz Swierczek <t.swierczek@samsung.com> | 2018-04-19 07:00:10 +0200 |
commit | ee31296a3cf4c9ef4d77298d781761e3bff5d279 (patch) | |
tree | 7023b4be8daf2d57df301658f8c9ad2a33d86b38 /tools | |
parent | 873b8e71eeab8beb2bcc87d518908887c43254e2 (diff) | |
download | key-manager-ee31296a3cf4c9ef4d77298d781761e3bff5d279.tar.gz key-manager-ee31296a3cf4c9ef4d77298d781761e3bff5d279.tar.bz2 key-manager-ee31296a3cf4c9ef4d77298d781761e3bff5d279.zip |
Disable default build with tz-backendsubmit/tizen/20180502.043224submit/tizen/20180430.063346submit/tizen/20180419.050559accepted/tizen/unified/20180502.111600
Migration to VD causes build breaks because of missing optee dependency.
Relation between key-manager and key-manager-ta needs to be re-worked.
For now it will be disabled.
Change-Id: I5312db283e3514d7c54dfa7caffd6738b5568e2f
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ckm_db_tool/CMakeLists.txt | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/tools/ckm_db_tool/CMakeLists.txt b/tools/ckm_db_tool/CMakeLists.txt index 65247120..7b78c1a9 100644 --- a/tools/ckm_db_tool/CMakeLists.txt +++ b/tools/ckm_db_tool/CMakeLists.txt @@ -1,6 +1,12 @@ SET(CKM_DB_TOOL "ckm_db_tool") SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager) +IF (TZ_BACKEND_ENABLED) +SET(CKM_DB_TOOL_EXTRA_DEP + tef-libteec + ) +ENDIF() + PKG_CHECK_MODULES(CKM_DB_TOOL_DEP REQUIRED openssl @@ -11,7 +17,7 @@ PKG_CHECK_MODULES(CKM_DB_TOOL_DEP cynara-client-async cynara-creds-socket security-manager - tef-libteec + ${CKM_DB_TOOL_EXTRA_DEP} ) FIND_PACKAGE(Threads REQUIRED) @@ -38,11 +44,6 @@ SET(CKM_DB_TOOL_SOURCES ${KEY_MANAGER_PATH}/crypto/sw-backend/internals.cpp ${KEY_MANAGER_PATH}/crypto/sw-backend/obj.cpp ${KEY_MANAGER_PATH}/crypto/sw-backend/store.cpp - ${KEY_MANAGER_PATH}/crypto/tz-backend/internals.cpp - ${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp - ${KEY_MANAGER_PATH}/crypto/tz-backend/store.cpp - ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-context.cpp - ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-memory.cpp ${KEY_MANAGER_PATH}/dpl/core/src/assert.cpp ${KEY_MANAGER_PATH}/dpl/db/src/naive_synchronization_object.cpp ${KEY_MANAGER_PATH}/dpl/db/src/sql_connection.cpp @@ -78,15 +79,34 @@ SET(CKM_DB_TOOL_SOURCES ${KEY_MANAGER_PATH}/sqlcipher/sqlcipher.c ) +IF(TZ_BACKEND_ENABLED) +SET(CKM_DB_TOOL_SOURCES + ${CKM_DB_TOOL_SOURCES} + ${KEY_MANAGER_PATH}/crypto/tz-backend/internals.cpp + ${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp + ${KEY_MANAGER_PATH}/crypto/tz-backend/store.cpp + ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-context.cpp + ${KEY_MANAGER_PATH}/crypto/tz-backend/tz-memory.cpp + ) +ENDIF() + LINK_DIRECTORIES(${CKM_DB_TOOL_DEP_LIBRARY_DIRS}) ADD_EXECUTABLE( ${CKM_DB_TOOL} ${CKM_DB_TOOL_SOURCES} ) +IF(TZ_BACKEND_ENABLED) +SET(CKM_DB_TOOL_LINK_EXTRA_DEPS + ${CKM_DB_TOOL_LINK_EXTRA_DEPS} + teec + km_serialization + ) +ENDIF() + TARGET_LINK_LIBRARIES(${CKM_DB_TOOL} ${CMAKE_THREAD_LIBS_INIT} ${CKM_DB_TOOL_DEP_LIBRARIES} ${TARGET_KEY_MANAGER_COMMON} - teec km_serialization + ${CKM_DB_TOOL_LINK_EXTRA_DEPS} -ldl ) |