Fix merge conflict

src/stationapi/CMakeLists.txt

@@ -1,11 +1,5 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
-    ${PROJECT_SOURCE_DIR}/externals/udplibrary
-    ${Boost_INCLUDE_DIRS}
-    ${SQLite3_INCLUDE_DIR})
 
-set(SOURCES
+add_library(stationapi
     Node.hpp
     NodeClient.cpp
     NodeClient.hpp
@@ -16,6 +10,10 @@ set(SOURCES
     StringUtils.cpp
     StringUtils.hpp)
 
-add_library(stationapi ${SOURCES})
-
-GroupSourceByFilesystem("${SOURCES}")
+target_include_directories(stationapi PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${PROJECT_SOURCE_DIR}/externals/catch
+    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
+    ${PROJECT_SOURCE_DIR}/externals/udplibrary
+    ${Boost_INCLUDE_DIRS}
+    ${SQLite3_INCLUDE_DIR})

src/stationchat/CMakeLists.txt

@@ -1,12 +1,5 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/src/stationapi
-    ${PROJECT_SOURCE_DIR}/externals/easyloggingpp
-    ${PROJECT_SOURCE_DIR}/externals/udplibrary
-    ${Boost_INCLUDE_DIRS}
-    ${SQLite3_INCLUDE_DIR})
 
-set(SOURCES
+add_executable(stationchat
     protocol/AddBan.hpp
     protocol/AddFriend.hpp
     protocol/AddIgnore.hpp
@@ -69,16 +62,17 @@ set(SOURCES
     StationChatApp.hpp
     StationChatConfig.hpp)
 
-add_executable(stationchat ${SOURCES})
-
-GroupSourceByFilesystem("${SOURCES}")
-
 target_link_libraries(stationchat
     stationapi
     udplibrary
     ${Boost_LIBRARIES}
     ${SQLite3_LIBRARY})
 
+target_include_directories(stationchat PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR})
+
 if(WIN32)
     target_link_libraries(stationchat ws2_32)
 endif()
+
+install(TARGETS stationchat RUNTIME DESTINATION bin)

src/stationchat/main.cpp

@@ -1,7 +1,7 @@
 
 
 #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING 1
-#define ELPP_DEFAULT_LOG_FILE "logs/swgchat.log"
+#define ELPP_NO_DEFAULT_LOG_FILE
 
 #include "easylogging++.h"
 
@@ -56,9 +56,9 @@ StationChatConfig BuildConfiguration(int argc, const char* argv[]) {
     po::options_description generic("Generic options");
     generic.add_options()
         ("help,h", "produces help message")
-        ("config,c", po::value<std::string>(&configFile)->default_value("swgchat.cfg"),
+        ("config,c", po::value<std::string>(&configFile)->default_value("etc/stationapi/swgchat.cfg"),
             "sets path to the configuration file")
-        ("logger_config", po::value<std::string>(&config.loggerConfig)->default_value("logger.cfg"),
+        ("logger_config", po::value<std::string>(&config.loggerConfig)->default_value("etc/stationapi/logger.cfg"),
             "sets path to the logger configuration file")
         ;
 
@@ -74,7 +74,7 @@ StationChatConfig BuildConfiguration(int argc, const char* argv[]) {
             "port for registrar connections")
         ("bind_to_ip", po::value<bool>(&config.bindToIp)->default_value(false),
             "when set to true, binds to the config address; otherwise, binds on any interface")
-        ("database_path", po::value<std::string>(&config.chatDatabasePath)->default_value("chat.db"),
+        ("database_path", po::value<std::string>(&config.chatDatabasePath)->default_value("var/stationapi/stationchat.db"),
             "path to the sqlite3 database file")
         ;