From a022a37aab38dc4890d5a13c5f0d6835ec49934e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 3 Jan 2019 21:32:44 +0100
Subject: [PATCH] Automatically copy libmysql.dll to bin folder

---
 CMakeLists.txt            | 1 -
 cmake/FindMySQL.cmake     | 6 ++++++
 src/common/CMakeLists.txt | 8 +++-----
 src/tools/CMakeLists.txt  | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 127d1ea7..82d9129c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_policy( SET CMP0014 NEW )
 cmake_minimum_required( VERSION 3.0.2 )
 project( Sapphire )
 
-
 set( CMAKE_MODULE_PATH
        ${CMAKE_MODULE_PATH}
        ${CMAKE_SOURCE_DIR}/cmake )
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index 5fd19dae..731d9fc1 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -189,6 +189,12 @@ if( WIN32 )
       "$ENV{MYSQL_ROOT}/lib"
     DOC "Specify the location of the mysql library here."
   )
+
+  STRING( REGEX REPLACE "(.lib)$" ".dll" MYSQL_DLL ${MYSQL_LIBRARY} )
+
+  file(COPY ${MYSQL_DLL}
+            DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+
 endif( WIN32 )
 
 # On Windows you typically don't need to include any extra libraries
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 9eadc792..88ab338d 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -18,8 +18,8 @@ add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
 
 target_link_libraries( common
                          PUBLIC
-			   xivdat
-			   mysqlConnector
+                           xivdat
+                           mysqlConnector
                            mysql )
 if( UNIX )
   target_link_libraries( common 
@@ -33,7 +33,5 @@ target_include_directories( common
                                 "${CMAKE_CURRENT_SOURCE_DIR}/"
                                 "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/"
                                 "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/asio/asio/include/"
-                                "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/"
-                              PRIVATE
-                                "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/")
+                                "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include/" )
 
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 06af4261..d7ae59e2 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -2,7 +2,6 @@ cmake_policy( SET CMP0014 NEW )
 cmake_minimum_required( VERSION 3.0.2 )
 project( Sapphire )
 
-#set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin )
 set( EXECUTABLE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/tools )
 set( LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/tools )