projects
/
platform
/
core
/
test
/
security-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nether' into tizen
[platform/core/test/security-tests.git]
/
src
/
ckm
/
CMakeLists.txt
diff --git
a/src/ckm/CMakeLists.txt
b/src/ckm/CMakeLists.txt
index
024e0e5
..
97f1239
100644
(file)
--- a/
src/ckm/CMakeLists.txt
+++ b/
src/ckm/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (c) 2013-201
8
Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2013-201
9
Samsung Electronics Co., Ltd All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-29,10
+29,19
@@
ENDIF (DEFINED SECURITY_MDFPP_STATE_ENABLED)
ADD_DEFINITIONS("-DCKM_TEST_DIR=\"${CKM_TEST_DIR}\"")
ADD_DEFINITIONS("-DCKM_RW_DATA_DIR=\"${CKM_RW_DATA_DIR}\"")
ADD_DEFINITIONS("-DCKM_TEST_DIR=\"${CKM_TEST_DIR}\"")
ADD_DEFINITIONS("-DCKM_RW_DATA_DIR=\"${CKM_RW_DATA_DIR}\"")
+OPTION("TZ_BACKEND" OFF)
+IF(TZ_BACKEND)
+ ADD_DEFINITIONS("-DTZ_BACKEND")
+ENDIF(TZ_BACKEND)
+
+OPTION("TZ_BACKEND" OFF)
+IF(TZ_BACKEND)
+ ADD_DEFINITIONS("-DTZ_BACKEND")
+ENDIF(TZ_BACKEND)
PKG_CHECK_MODULES(CKM_TEST_COMMON_DEP
REQUIRED
PKG_CHECK_MODULES(CKM_TEST_COMMON_DEP
REQUIRED
- openssl
+ openssl
1.1
key-manager
libtzplatform-config
)
key-manager
libtzplatform-config
)
@@
-63,7
+72,6
@@
ADD_EXECUTABLE(${TARGET_C_COMPILATION_TEST} ${C_COMPILATION_SOURCES})
TARGET_LINK_LIBRARIES(${TARGET_C_COMPILATION_TEST} ${CKM_C_COMPILATION_DEP_LIBRARIES})
INSTALL(DIRECTORY resource/ DESTINATION ${CKM_TEST_DIR})
TARGET_LINK_LIBRARIES(${TARGET_C_COMPILATION_TEST} ${CKM_C_COMPILATION_DEP_LIBRARIES})
INSTALL(DIRECTORY resource/ DESTINATION ${CKM_TEST_DIR})
-INSTALL(FILES resource/test.xml DESTINATION /opt/data/ckm/initial_values)
ADD_SUBDIRECTORY(privileged)
ADD_SUBDIRECTORY(unprivileged)
ADD_SUBDIRECTORY(privileged)
ADD_SUBDIRECTORY(unprivileged)