From 70d45f6f309a70d3ed60464786fedc09d79fafd5 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 12 Sep 2017 19:01:53 +0200
Subject: [PATCH] Moved cmake files to own folder

---
 CMakeLists.txt                                | 20 +++++++++++++------
 .../FindMySQLConnectorCPP.cmake               |  0
 boost.cmake => cmake/boost.cmake              |  0
 compiler.cmake => cmake/compiler.cmake        |  0
 4 files changed, 14 insertions(+), 6 deletions(-)
 rename FindMySQLConnectorCPP.cmake => cmake/FindMySQLConnectorCPP.cmake (100%)
 rename boost.cmake => cmake/boost.cmake (100%)
 rename compiler.cmake => cmake/compiler.cmake (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04a73b62..2e4005ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,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})
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 # boost stuff
 # set(Boost_DEBUG 1)
 
@@ -20,12 +20,21 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
 set(SERVER_COMMON_DIR ${CMAKE_SOURCE_DIR}/src/servers/Server_Common)
 
 
-include( "boost.cmake" )
-include( "compiler.cmake" )
+include( "cmake/boost.cmake" )
+include( "cmake/compiler.cmake" )
+
+if( NOT $MYSQLCONNECTORCPP_ROOT_DIR )
+    set( MYSQLCONNECTORCPP_ROOT_DIR "G:\\programming\\libs\\MySQL1.1.9" )
+endif()
 
-set( MYSQLCONNECTORCPP_ROOT_DIR "G:\\programming\\libs\\MySQL1.1.9" )
 FIND_PACKAGE(MySQLConnectorCPP)
 
+if( MYSQLCONNECTORCPP_FOUND )
+    message( "Found Mysql C++ Connector at ${MYSQLCONNECTORCPP_INCLUDE_DIR}" )
+else()
+    message( FATAL_ERROR "You are missing the Mysql C++ Connector 1.1" )
+endif()
+
 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")
@@ -36,8 +45,7 @@ include_directories("${PROJECT_SOURCE_DIR}")
 
 link_directories(${MYSQLCONNECTORCPP_LIBRARIES})
 link_directories(${SERVER_COMMON_DIR})
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader)
-
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader)
 
 add_subdirectory("src/servers")
 add_subdirectory("src/libraries/sapphire/datReader")
diff --git a/FindMySQLConnectorCPP.cmake b/cmake/FindMySQLConnectorCPP.cmake
similarity index 100%
rename from FindMySQLConnectorCPP.cmake
rename to cmake/FindMySQLConnectorCPP.cmake
diff --git a/boost.cmake b/cmake/boost.cmake
similarity index 100%
rename from boost.cmake
rename to cmake/boost.cmake
diff --git a/compiler.cmake b/cmake/compiler.cmake
similarity index 100%
rename from compiler.cmake
rename to cmake/compiler.cmake