Move database schema into a more convenient location

Change-Id: I7444211fd43be873d62c423ccd32fac65e40773e
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50d2589..1c5b171 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,3 +61,4 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(pc)
 ADD_SUBDIRECTORY(systemd)
+ADD_SUBDIRECTORY(db)

diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9e8ffcc
--- /dev/null
+++ b/db/CMakeLists.txt
@@ -0,0 +1,12 @@
+SET(TARGET_DB ".security-manager.db")
+
+ADD_CUSTOM_COMMAND(
+    OUTPUT ${TARGET_DB} ${TARGET_DB}-journal
+    COMMAND sqlite3 ${TARGET_DB} <db.sql
+    )
+
+# Add a dummy build target to trigger building of ${TARGET_DB}
+ADD_CUSTOM_TARGET(DB ALL DEPENDS ${TARGET_DB})
+
+INSTALL(FILES ${TARGET_DB} DESTINATION ${DB_INSTALL_DIR})
+INSTALL(FILES ${TARGET_DB}-journal DESTINATION ${DB_INSTALL_DIR})

diff --git a/src/server/db/db.sql b/db/db.sql
similarity index 100%
rename from src/server/db/db.sql
rename to db/db.sql

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30d65cb..603c713 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,8 +8,7 @@ SET(CMD_PATH     ${PROJECT_SOURCE_DIR}/src/cmd)
 SET(TARGET_SERVER "security-manager")
 SET(TARGET_CLIENT "security-manager-client")
 SET(TARGET_COMMON "security-manager-commons")
-SET(TARGET_DB ".security-manager.db")
-SET(TARGET_CMD "security-manager-cmd")
+SET(TARGET_CMD    "security-manager-cmd")
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(common)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 6117a17..72b151f 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -42,14 +42,4 @@ TARGET_LINK_LIBRARIES(${TARGET_SERVER}
     ${SERVER_DEP_LIBRARIES}
     )
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${TARGET_DB} ${TARGET_DB}-journal
-    COMMAND sqlite3 ${TARGET_DB} <db/db.sql
-    )
-
-# Add a dummy build target to trigger building of ${TARGET_DB}
-ADD_CUSTOM_TARGET(DB ALL DEPENDS ${TARGET_DB})
-
 INSTALL(TARGETS ${TARGET_SERVER} DESTINATION ${BIN_INSTALL_DIR})
-INSTALL(FILES ${TARGET_DB} DESTINATION ${DB_INSTALL_DIR})
-INSTALL(FILES ${TARGET_DB}-journal DESTINATION ${DB_INSTALL_DIR})