From f40ac40f02bc31c16ada062a387f78ac480906c3 Mon Sep 17 00:00:00 2001
From: H0zen <compteh@ub.ro>
Date: Wed, 28 Mar 2018 23:45:03 +0300
Subject: [PATCH] Make AppVeyor happy

---
 cmake/FindMySQL.cmake      | 2 +-
 cmake/SetDefinitions.cmake | 3 ++-
 src/CMakeLists.txt         | 6 ++++--
 src/game/CMakeLists.txt    | 6 ------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
index bd43b180..b87e5ca6 100644
--- a/cmake/FindMySQL.cmake
+++ b/cmake/FindMySQL.cmake
@@ -38,7 +38,7 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
     )
     find_library(MYSQL_LIBRARY
       NAMES
-        libmysql
+        libmysql libmariadb
       PATHS
         "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.0/lib/opt"
         "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.1/lib/opt"
diff --git a/cmake/SetDefinitions.cmake b/cmake/SetDefinitions.cmake
index 595f2288..a77ab9fa 100644
--- a/cmake/SetDefinitions.cmake
+++ b/cmake/SetDefinitions.cmake
@@ -43,6 +43,7 @@ if(WIN32)
     set(LIBS_DIR ${CMAKE_INSTALL_PREFIX}/)
 
     if(MSVC)
+    set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
         if(PLATFORM EQUAL 64)
             # This definition is necessary to work around a bug with Intellisense described
             # here: http://tinyurl.com/2cb428.  Syntax highlighting is important for proper
@@ -149,4 +150,4 @@ elseif(UNIX)
         # -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wno-ignored-attributes -Wno-deprecated-declarations")
     endif()
-endif()
\ No newline at end of file
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df95d977..500f19ec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,7 +55,9 @@ endif()
 if (BUILD_MANGOSD OR BUILD_REALMD)
 if(WIN32)
   get_filename_component(MYSQL_LIB_DIR ${MYSQL_LIBRARY} DIRECTORY)
-  install(FILES ${MYSQL_LIB_DIR}/libmysql.dll DESTINATION ${BIN_DIR})
+  get_filename_component(MYSQL_LIB_DLL ${MYSQL_LIBRARY} NAME)
+  STRING(REPLACE ".lib" ".dll" MYSQL_LIB_DLL ${MYSQL_LIB_DLL})
+  install(FILES ${MYSQL_LIB_DIR}/${MYSQL_LIB_DLL} DESTINATION ${BIN_DIR})
   install(FILES ${OPENSSL_ROOT_DIR}/libeay32.dll DESTINATION ${BIN_DIR})
 endif()
-endif()
\ No newline at end of file
+endif()
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 277e0a9c..ca383b73 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -189,9 +189,3 @@ endif()
 #AH Bot Config
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/AuctionHouseBot/ahbot.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" DESTINATION "${CONF_INSTALL_DIR}")
-
-if(WIN32 AND MSVC)
-    add_custom_command(TARGET ${LIBRARY_NAME}
-        POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/AuctionHouseBot/ahbot.conf.dist" "${CONF_COPY_DIR}"
-    )
-endif()
\ No newline at end of file