From 422093589e7efb23a579cf527a6f75bc883d8200 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 5 Nov 2022 00:16:43 +0100
Subject: [PATCH] fix linux cmake bugs

---
 app/server/CMakeLists.txt          | 12 +++++++-----
 app/server/{ => build}/config.json |  0
 app/server/main.cpp                |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename app/server/{ => build}/config.json (100%)

diff --git a/app/server/CMakeLists.txt b/app/server/CMakeLists.txt
index c5cabff..ec76adc 100755
--- a/app/server/CMakeLists.txt
+++ b/app/server/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.2)
 project( OnlineResourceWatcherServerApp )
 add_executable( OnlineResourceWatcherServerApp main.cpp )
 
@@ -6,19 +6,21 @@ set(CMAKE_CXX_FLAGS "-march=native -msse2 -mavx -maes -fpermissive")
 
 include_directories( /usr/include )
 link_directories( /usr/lib )
+link_directories( /usr/lib/x86_64-linux-gnu )
 
 # SQLite3
-target_link_libraries( OnlineResourceWatcherServerApp sqlite3 )
+target_link_libraries( OnlineResourceWatcherServerApp PRIVATE sqlite3 )
 
 # MariaDB
-target_link_libraries( OnlineResourceWatcherServerApp mysql )
+target_link_libraries( OnlineResourceWatcherServerApp PRIVATE mysqlclient )
 
 # Postgresql
 target_include_directories( OnlineResourceWatcherServerApp PRIVATE /usr/include/postgresql )
-target_link_libraries( OnlineResourceWatcherServerApp libpq )
+target_link_directories( OnlineResourceWatcherServerApp PRIVATE /usr/lib/postgresql/10/lib )
+target_link_libraries( OnlineResourceWatcherServerApp PRIVATE pq )
 
 # Libcurl
-target_link_libraries( OnlineResourceWatcherServerApp libcurl )
+target_link_libraries( OnlineResourceWatcherServerApp PRIVATE curl )
 
 # cmake -DCMAKE_BUILD_TYPE=Debug -DOMS_DEBUG=true
 # cmake -DCMAKE_BUILD_TYPE=Release -DOMS_DEMO=true
\ No newline at end of file
diff --git a/app/server/config.json b/app/server/build/config.json
similarity index 100%
rename from app/server/config.json
rename to app/server/build/config.json
diff --git a/app/server/main.cpp b/app/server/main.cpp
index 0000970..2719d0a 100755
--- a/app/server/main.cpp
+++ b/app/server/main.cpp
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
         DataStorage::Database::database_type_from_str(app.config["db"]["core"]["masters"]["admin"]["db"].get_ref<const std::string&>().c_str()),
         app.config["db"]["core"]["masters"]["admin"]["database"].get_ref<const std::string&>().c_str(),
         app.config["db"]["core"]["masters"]["admin"]["host"].get_ref<const std::string&>().c_str(),
-        app.config["db"]["core"]["masters"]["admin"]["port"].get<int>(),
+        atoi(app.config["db"]["core"]["masters"]["admin"]["port"].get_ref<const std::string&>().c_str()),
         app.config["db"]["core"]["masters"]["admin"]["login"].get_ref<const std::string&>().c_str(),
         app.config["db"]["core"]["masters"]["admin"]["password"].get_ref<const std::string&>().c_str(),
     };