fix linux cmake bugs

This commit is contained in:
Dennis Eichhorn 2022-11-05 00:16:43 +01:00
parent 4ce9bf9daf
commit 422093589e
3 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.2)
project( OnlineResourceWatcherServerApp ) project( OnlineResourceWatcherServerApp )
add_executable( OnlineResourceWatcherServerApp main.cpp ) add_executable( OnlineResourceWatcherServerApp main.cpp )
@ -6,19 +6,21 @@ set(CMAKE_CXX_FLAGS "-march=native -msse2 -mavx -maes -fpermissive")
include_directories( /usr/include ) include_directories( /usr/include )
link_directories( /usr/lib ) link_directories( /usr/lib )
link_directories( /usr/lib/x86_64-linux-gnu )
# SQLite3 # SQLite3
target_link_libraries( OnlineResourceWatcherServerApp sqlite3 ) target_link_libraries( OnlineResourceWatcherServerApp PRIVATE sqlite3 )
# MariaDB # MariaDB
target_link_libraries( OnlineResourceWatcherServerApp mysql ) target_link_libraries( OnlineResourceWatcherServerApp PRIVATE mysqlclient )
# Postgresql # Postgresql
target_include_directories( OnlineResourceWatcherServerApp PRIVATE /usr/include/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 # Libcurl
target_link_libraries( OnlineResourceWatcherServerApp libcurl ) target_link_libraries( OnlineResourceWatcherServerApp PRIVATE curl )
# cmake -DCMAKE_BUILD_TYPE=Debug -DOMS_DEBUG=true # cmake -DCMAKE_BUILD_TYPE=Debug -DOMS_DEBUG=true
# cmake -DCMAKE_BUILD_TYPE=Release -DOMS_DEMO=true # cmake -DCMAKE_BUILD_TYPE=Release -DOMS_DEMO=true

View File

@ -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()), 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"]["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"]["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"]["login"].get_ref<const std::string&>().c_str(),
app.config["db"]["core"]["masters"]["admin"]["password"].get_ref<const std::string&>().c_str(), app.config["db"]["core"]["masters"]["admin"]["password"].get_ref<const std::string&>().c_str(),
}; };