diff options
| author | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2016-08-24 12:35:48 +0200 |
|---|---|---|
| committer | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2016-09-20 17:03:20 +0200 |
| commit | 209037d92b8d0b194cbf1e0d96bbb4b2a781bffa (patch) | |
| tree | 963d9c2de5f74d61e2b4b7e825173007f846adf0 | |
| parent | 9b4b1d0a76019fe4a1daa3bd221eda16e1454917 (diff) | |
| download | key-manager-209037d92b8d0b194cbf1e0d96bbb4b2a781bffa.tar.gz key-manager-209037d92b8d0b194cbf1e0d96bbb4b2a781bffa.tar.bz2 key-manager-209037d92b8d0b194cbf1e0d96bbb4b2a781bffa.zip | |
Fix compilation scripts.
key-manager does not build when libraries are placed in
non standard directories.
Change-Id: I5e60c51ba89059fd233c721c0122dd66f33fd5ba
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/manager/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/encryption-scheme/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/ckm_db_tool/CMakeLists.txt | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 081b2653..4851987a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,6 +107,8 @@ INCLUDE_DIRECTORIES( ${KEY_MANAGER_PATH}/crypto ) +LINK_DIRECTORIES(KEY_MANAGER_DEP_LIBRARY_DIRS}) + ADD_EXECUTABLE(${TARGET_KEY_MANAGER} ${KEY_MANAGER_SOURCES}) # pie flag is added for ASLR diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index 73820db4..f0770e1c 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -52,6 +52,8 @@ INCLUDE_DIRECTORIES( ${COMMON_PATH}/service ) +LINK_DIRECTORIES(${COMMON_DEP_LIBRARY_DIRS}) + ADD_LIBRARY(${TARGET_KEY_MANAGER_COMMON} SHARED ${COMMON_SOURCES}) SET_TARGET_PROPERTIES( diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1734608b..186a659b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -66,6 +66,8 @@ SET(TEST_MERGED_SOURCES ${KEY_MANAGER_PATH}/sqlcipher/sqlcipher.c ) +LINK_DIRECTORIES(${KEY_MANAGER_DEP_LIBRARY_DIRS}) + ADD_EXECUTABLE(${TARGET_TEST_MERGED} ${TEST_MERGED_SOURCES}) TARGET_LINK_LIBRARIES(${TARGET_TEST_MERGED} diff --git a/tests/encryption-scheme/CMakeLists.txt b/tests/encryption-scheme/CMakeLists.txt index a291583e..65b7c260 100644 --- a/tests/encryption-scheme/CMakeLists.txt +++ b/tests/encryption-scheme/CMakeLists.txt @@ -56,6 +56,8 @@ INCLUDE_DIRECTORIES( ${KEY_MANAGER_PATH}/crypto ) +LINK_DIRECTORIES(${ENCRYPTION_SCHEME_DEP_LIBRARY_DIRS}) + ADD_LIBRARY(${TARGET_ENCRYPTION_SCHEME_COMMON} STATIC ${ENCRYPTION_SCHEME_SOURCES}) TARGET_LINK_LIBRARIES(${TARGET_ENCRYPTION_SCHEME_COMMON} diff --git a/tools/ckm_db_tool/CMakeLists.txt b/tools/ckm_db_tool/CMakeLists.txt index 6fdce572..5790b7c2 100644 --- a/tools/ckm_db_tool/CMakeLists.txt +++ b/tools/ckm_db_tool/CMakeLists.txt @@ -74,6 +74,8 @@ SET(CKM_DB_TOOL_SOURCES ${KEY_MANAGER_PATH}/sqlcipher/sqlcipher.c ) +LINK_DIRECTORIES(${CKM_DB_TOOL_DEP_LIBRARY_DIRS}) + ADD_EXECUTABLE( ${CKM_DB_TOOL} ${CKM_DB_TOOL_SOURCES} ) TARGET_LINK_LIBRARIES(${CKM_DB_TOOL} |