projects
/
platform
/
core
/
security
/
key-manager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 0.1.68
[platform/core/security/key-manager.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
6764fbb
..
ecfc13d
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-29,13
+29,13
@@
INCLUDE(FindPkgConfig)
############################# compiler flags ##################################
SET(CMAKE_C_FLAGS_PROFILING "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
############################# compiler flags ##################################
SET(CMAKE_C_FLAGS_PROFILING "-g -O0 -pg -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_CXX_FLAGS_PROFILING "-g -std=c++1
4 -O0 -pg -Wp,-U_FORTIFY_SOURCE
")
+SET(CMAKE_CXX_FLAGS_PROFILING "-g -std=c++1
7 -O0 -pg -Wp,-U_FORTIFY_SOURCE -Wno-deprecated-declarations
")
SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -ggdb -Wp,-U_FORTIFY_SOURCE")
-SET(CMAKE_CXX_FLAGS_DEBUG "-g -std=c++1
4 -O0 -ggdb -Wp,-U_FORTIFY_SOURCE
")
+SET(CMAKE_CXX_FLAGS_DEBUG "-g -std=c++1
7 -O0 -ggdb -Wp,-U_FORTIFY_SOURCE -Wshadow -Wno-deprecated-declarations
")
SET(CMAKE_C_FLAGS_RELEASE "-g -O2")
SET(CMAKE_C_FLAGS_RELEASE "-g -O2")
-SET(CMAKE_CXX_FLAGS_RELEASE "-g -std=c++1
4 -O2
")
-SET(CMAKE_C_FLAGS_C
COV "-g -O2 --coverage
")
-SET(CMAKE_CXX_FLAGS_C
COV "-g -std=c++14 -O2 --coverage
")
+SET(CMAKE_CXX_FLAGS_RELEASE "-g -std=c++1
7 -O2 -Wshadow -Wno-deprecated-declarations
")
+SET(CMAKE_C_FLAGS_C
OVERAGE "-g -O0 -ggdb --coverage -Wp,-U_FORTIFY_SOURCE
")
+SET(CMAKE_CXX_FLAGS_C
OVERAGE "-g -std=c++17 -O0 -ggdb --coverage -Wp,-U_FORTIFY_SOURCE -Wno-deprecated-declarations
")
# Force PIE
SET(CMAKE_POSITION_INDEPENDENT_CODE "True")
# Force PIE
SET(CMAKE_POSITION_INDEPENDENT_CODE "True")
@@
-69,6
+69,14
@@
ADD_DEFINITIONS("-DSYSTEMD_ENV_FILE=\"${SYSTEMD_ENV_FILE}\"")
SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager)
+IF(NOT DEFINED COVERAGE_DIR)
+ SET(COVERAGE_DIR
+ "/opt/data/ckm-coverage"
+ CACHE PATH
+ "Read-only coverage data directory")
+ENDIF(NOT DEFINED COVERAGE_DIR)
+ADD_DEFINITIONS("-DCOVERAGE_DIR=\"${COVERAGE_DIR}\"")
+
IF (TZ_BACKEND_ENABLED)
ADD_DEFINITIONS("-DTZ_BACKEND_ENABLED")
SET(EXTRA_KM_DEPS ${EXTRA_KM_DEPS} tef-libteec)
IF (TZ_BACKEND_ENABLED)
ADD_DEFINITIONS("-DTZ_BACKEND_ENABLED")
SET(EXTRA_KM_DEPS ${EXTRA_KM_DEPS} tef-libteec)
@@
-76,6
+84,7
@@
IF (TZ_BACKEND_ENABLED)
SET(TZ_BACKEND_SOURCES
${KEY_MANAGER_PATH}/crypto/tz-backend/internals.cpp
${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp
SET(TZ_BACKEND_SOURCES
${KEY_MANAGER_PATH}/crypto/tz-backend/internals.cpp
${KEY_MANAGER_PATH}/crypto/tz-backend/obj.cpp
+ ${KEY_MANAGER_PATH}/crypto/tz-backend/ctx.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}/crypto/tz-backend/store.cpp
${KEY_MANAGER_PATH}/crypto/tz-backend/tz-context.cpp
${KEY_MANAGER_PATH}/crypto/tz-backend/tz-memory.cpp
@@
-83,6
+92,14
@@
IF (TZ_BACKEND_ENABLED)
)
ENDIF()
)
ENDIF()
+IF (SE_BACKEND_ENABLED)
+ ADD_DEFINITIONS("-DSE_BACKEND_ENABLED")
+ SET(SE_BACKEND_SOURCES
+ ${KEY_MANAGER_PATH}/crypto/se-backend/internals.cpp
+ )
+ SET(EXTRA_KM_DEPS ${EXTRA_KM_DEPS} key-manager-se-backend)
+ENDIF()
+
IF (DEFINED WATCHDOG_ENABLED)
MESSAGE("WATCHDOG ENABLED!")
ADD_DEFINITIONS("-DWATCHDOG_ENABLED")
IF (DEFINED WATCHDOG_ENABLED)
MESSAGE("WATCHDOG ENABLED!")
ADD_DEFINITIONS("-DWATCHDOG_ENABLED")
@@
-111,9
+128,9
@@
PKG_CHECK_MODULES(KEY_MANAGER_DEP
REQUIRED
dlog
glib-2.0
REQUIRED
dlog
glib-2.0
- openssl
1.1
+ openssl
3
libsmack
libsmack
- libsystemd
-daemon
+ libsystemd
capi-base-common
capi-system-info
libxml-2.0
capi-base-common
capi-system-info
libxml-2.0
@@
-123,9
+140,11
@@
PKG_CHECK_MODULES(KEY_MANAGER_DEP
pkgmgr
vconf
sqlcipher
pkgmgr
vconf
sqlcipher
+ capi-system-resource
${EXTRA_KM_DEPS}
)
${EXTRA_KM_DEPS}
)
+IF (NOT DEFINED COVERAGE_ONLY)
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(src)
@@
-133,4
+152,6
@@
ADD_SUBDIRECTORY(build)
ADD_SUBDIRECTORY(systemd)
ADD_SUBDIRECTORY(misc)
ADD_SUBDIRECTORY(upgrade)
ADD_SUBDIRECTORY(systemd)
ADD_SUBDIRECTORY(misc)
ADD_SUBDIRECTORY(upgrade)
-ADD_SUBDIRECTORY(unit-tests)
\ No newline at end of file
+ENDIF (NOT DEFINED COVERAGE_ONLY)
+
+ADD_SUBDIRECTORY(unit-tests)