Make dindexer-common depend on postgre backend and fix build

CMakeLists.txt

@@ -33,6 +33,7 @@ if(DINDEXER_NATIVE_RELEASE)
 else()
 	set(march_flag "")
 endif()
+set(DINDEXER_DB_BACKEND "PostgreSQL")
 set(DINDEXER_COPYRIGHT_YEARS "2015,2016")
 set(DINDEXER_ACTIONS_PATH "${CMAKE_CURRENT_BINARY_DIR}/src" CACHE STRING "Actions search path")
 string(REGEX MATCH "[^/].*" ACTIONS_PATH_INSTALL "${DINDEXER_ACTIONS_PATH}")

include/dindexer-common/settings.hpp

@@ -19,7 +19,7 @@
 #define idDC29E3C667BD4793BA0644AE7DC5BD3F
 
 #include <string>
-#include "backends/postgresql/settings.hpp"
+#include "db/settings.hpp"
 
 namespace dinlib {
 	struct Settings {

src/backends/postgresql/CMakeLists.txt

@@ -11,11 +11,12 @@ add_library(${PROJECT_NAME} STATIC
 target_include_directories(${PROJECT_NAME}
 	PUBLIC ${CMAKE_SOURCE_DIR}/include/backends/postgresql
 )
-#target_include_directories(${PROJECT_NAME} SYSTEM
-#)
+target_include_directories(${PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIRS}
+)
 
 target_link_libraries(${PROJECT_NAME}
-	PRIVATE ${bare_name}-if
+	PRIVATE ${bare_name}-inc
 	PRIVATE ${bare_name}-pq
 )
 

src/common/CMakeLists.txt

@@ -19,10 +19,13 @@ target_include_directories(${PROJECT_NAME} SYSTEM
 	PRIVATE ${Readline_INCLUDE_DIR}
 )
 
+string(TOLOWER "${DINDEXER_DB_BACKEND}" DINDEXER_DB_BACKEND_LOWERCASE)
+
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${YAMLCPP_LIBRARY}
 	PRIVATE ${Readline_LIBRARY}
+	PUBLIC ${bare_name}-backend-${DINDEXER_DB_BACKEND_LOWERCASE}
 )
 
 #install(TARGETS ${PROJECT_NAME}

src/delete/CMakeLists.txt

@@ -12,7 +12,6 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")

src/delete/main.cpp

@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "backends/postgresql/delete.hpp"
+#include "db/delete.hpp"
 #include <iostream>
 #include <ciso646>
 #include <ios>

src/locate/CMakeLists.txt

@@ -16,7 +16,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
 	PRIVATE glob2regex
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")

src/locate/main.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "commandline.hpp"
-#include "backends/postgresql/locate.hpp"
+#include "db/locate.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "dindexerConfig.h"

src/navigate/CMakeLists.txt

@@ -16,7 +16,6 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 target_compile_features(${PROJECT_NAME}

src/navigate/listdircontent.cpp

@@ -17,7 +17,7 @@
 
 #include "listdircontent.hpp"
 #include "entrypath.hpp"
-#include "backends/postgresql/dbsource.hpp"
+#include "db/dbsource.hpp"
 #include "helpers/infix_iterator.hpp"
 #include <cassert>
 #include <utility>

src/navigate/main.cpp

@@ -19,7 +19,7 @@
 #include "commandprocessor.hpp"
 #include "dindexer-common/settings.hpp"
 #include "entrypath.hpp"
-#include "backends/postgresql/dbsource.hpp"
+#include "db/dbsource.hpp"
 #include "dindexerConfig.h"
 #include "linereader.hpp"
 #include "listdircontent.hpp"

src/scan/CMakeLists.txt

@@ -15,7 +15,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE ${bare_name}-machinery
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")

src/scan/main.cpp

@@ -25,7 +25,7 @@
 #include "dindexer-common/common_info.hpp"
 #include "dindexer-common/settings.hpp"
 #include "commandline.hpp"
-#include "backends/postgresql/scan.hpp"
+#include "db/scan.hpp"
 #include "dindexer-machinery/scantask/dirtree.hpp"
 #include "dindexer-machinery/scantask/mediatype.hpp"
 #include "dindexer-machinery/scantask/hashing.hpp"

src/tag/CMakeLists.txt

@@ -15,7 +15,6 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${bare_name}-if
 	PRIVATE ${bare_name}-common
 	PRIVATE glob2regex
-	PRIVATE ${bare_name}-backend-postgresql
 )
 
 string(REPLACE "${bare_name}-" "" ACTION_NAME "${PROJECT_NAME}")

src/tag/main.cpp

@@ -18,7 +18,7 @@
 #include "commandline.hpp"
 #include "dindexer-common/settings.hpp"
 #include "dindexerConfig.h"
-#include "backends/postgresql/tag.hpp"
+#include "db/tag.hpp"
 #include "dindexer-common/split_tags.hpp"
 #include "glob2regex/glob2regex.hpp"
 #include "enum.h"