From: Rafal Krypa Date: Mon, 2 Jun 2014 16:57:43 +0000 (+0200) Subject: Build security-manager-common with SqlConnection X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=feb200130a45d7fbe93e9fb734ac48a46aad4f45;p=platform%2Fcore%2Fsecurity%2Fsecurity-manager.git Build security-manager-common with SqlConnection Also adding build dependencies on sqlite3, db-util and boost. Change-Id: I65d55bfd30a600aab19bee489ef20b94b69b45a6 Signed-off-by: Rafal Krypa --- diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec index 302bc233..c064e337 100644 --- a/packaging/security-manager.spec +++ b/packaging/security-manager.spec @@ -15,6 +15,9 @@ BuildRequires: libcap-devel BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(libprivilege-control) BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(db-util) +BuildRequires: boost-devel %{?systemd_requires} %description diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index c52f61b2..ea5dc464 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -1,5 +1,12 @@ PKG_CHECK_MODULES(COMMON_DEP dlog + sqlite3 + db-util + REQUIRED + ) + +FIND_PACKAGE( + Boost REQUIRED ) @@ -21,17 +28,23 @@ SET(COMMON_SOURCES ${COMMON_PATH}/dpl/core/src/noncopyable.cpp ${COMMON_PATH}/dpl/core/src/serialization.cpp ${COMMON_PATH}/dpl/core/src/singleton.cpp + ${COMMON_PATH}/dpl/core/src/string.cpp + ${COMMON_PATH}/dpl/core/src/errno_string.cpp + ${COMMON_PATH}/dpl/db/src/sql_connection.cpp + ${COMMON_PATH}/dpl/db/src/naive_synchronization_object.cpp ${COMMON_PATH}/service/security-manager-common.cpp ) INCLUDE_DIRECTORIES(SYSTEM ${COMMON_DEP_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) INCLUDE_DIRECTORIES( ${COMMON_PATH}/common ${COMMON_PATH}/dpl/core/include ${COMMON_PATH}/dpl/log/include + ${COMMON_PATH}/dpl/db/include ) ADD_LIBRARY(${TARGET_SERVER_COMMON} SHARED ${COMMON_SOURCES})