Fix compilation scripts.

key-manager does not build when libraries are placed in
non standard directories.

Change-Id: I5e60c51ba89059fd233c721c0122dd66f33fd5ba

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 081b265..4851987 100644 (file)
--- 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 73820db..f0770e1 100644 (file)
--- 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 1734608..186a659 100644 (file)
--- 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 a291583..65b7c26 100644 (file)
--- 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 6fdce57..5790b7c 100644 (file)
--- 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}