From a6bbb9aa106e663aab0a4ee02e83aaeed8257bdb Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Tue, 12 Sep 2017 13:02:11 +0200
Subject: [PATCH] Even more cmake, trying to get mysqlcppconn working properly
 under windows

---
 CMakeLists.txt                           | 12 +++++++++++-
 src/servers/Server_Common/CMakeLists.txt |  4 ----
 src/servers/Server_Lobby/CMakeLists.txt  |  4 ----
 src/servers/Server_REST/CMakeLists.txt   |  4 ----
 src/servers/Server_Zone/CMakeLists.txt   |  5 -----
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74e2963d..348aff6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
 set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
-
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
 # boost stuff
 # set(Boost_DEBUG 1)
 
@@ -20,6 +20,16 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
 include( "boost.cmake" )
 include( "compiler.cmake" )
 
+FIND_PACKAGE(MySQLConnectorCPP)
+
+message(${MYSQLCONNECTORCPP_INCLUDE_DIR})
+message(${MYSQLCONNECTORCPP_LIBRARIES})
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/ChaiScript-6.0.0/include/")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQLpp/include/")
+include_directories("src")
+
 include_directories("${PROJECT_INCLUDE_DIR}")
 include_directories("${PROJECT_SOURCE_DIR}")
 
diff --git a/src/servers/Server_Common/CMakeLists.txt b/src/servers/Server_Common/CMakeLists.txt
index 6ec56654..338f1d45 100644
--- a/src/servers/Server_Common/CMakeLists.txt
+++ b/src/servers/Server_Common/CMakeLists.txt
@@ -1,10 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 project(Sapphire)
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQLpp/include/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/ChaiScript-6.0.0/include/")
-
 if(UNIX)
   include_directories("/usr/include/mysql/")
 else()
diff --git a/src/servers/Server_Lobby/CMakeLists.txt b/src/servers/Server_Lobby/CMakeLists.txt
index 0082b2f4..26bcafcc 100644
--- a/src/servers/Server_Lobby/CMakeLists.txt
+++ b/src/servers/Server_Lobby/CMakeLists.txt
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Sapphire)
 
-include_directories("../../libraries/external/ChaiScript-6.0.0/include/")
-include_directories("../../libraries/sapphire/datReader/")
-include_directories("../")
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt
index 99fe9b53..6bd2fda0 100644
--- a/src/servers/Server_REST/CMakeLists.txt
+++ b/src/servers/Server_REST/CMakeLists.txt
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
 project(Sapphire)
 
-include_directories("../../libraries/external/ChaiScript-6.0.0/include/")
-include_directories("../../libraries/sapphire/datReader/")
-include_directories("../")
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
 file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index af39e274..7bc4a8e1 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -4,11 +4,6 @@ cmake_policy(SET CMP0014 OLD)
 
 project(Sapphire_Zone)
 
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/ChaiScript-6.0.0/include/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQLpp/include/")
-include_directories("../")
-
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/Script/*)
 file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         *.c*