From 00f8fe97b0040eeddf4c62c3dc00d20f36e1c52c Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Fri, 4 Jan 2019 14:29:31 +0100
Subject: [PATCH] Fix for double mysql find

---
 CMakeLists.txt    |  2 +-
 cmake/mysql.cmake | 39 ---------------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 cmake/mysql.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82d9129c..e5dcb6b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ add_custom_target( copy_runtime_files ALL
 # Dependencies and compiler settings #
 ######################################
 include( "cmake/paths.cmake" )
-include( "cmake/mysql.cmake" )
+#include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
 include( "cmake/cotire.cmake" )
 
diff --git a/cmake/mysql.cmake b/cmake/mysql.cmake
deleted file mode 100644
index 77106bc9..00000000
--- a/cmake/mysql.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-
-if(UNIX)
-    find_path(MYSQL_INCLUDE_DIR mysql.h
-        /usr/include/mysql
-        /usr/local/include/mysql
-        /opt/mysql/mysql/include
-        /opt/mysql/mysql/include/mysql
-        /opt/mysql/include
-        /opt/local/include/mysql5
-        /usr/local/mysql/include
-        /usr/local/mysql/include/mysql
-        $ENV{ProgramFiles}/MySQL/*/include
-        $ENV{SystemDrive}/MySQL/*/include
-        ${LIBRARY_DIR}/external/MySQL/
-    )
-
-    if(MYSQL_INCLUDE_DIR)
-        set(MYSQL_FOUND TRUE)
-
-        include_directories(${MYSQL_INCLUDE_DIR})
-    endif(MYSQL_INCLUDE_DIR)
-
-    if(MYSQL_FOUND)
-        message(STATUS "MySQL include dir: ${MYSQL_INCLUDE_DIR}")
-    else(MYSQL_FOUND)
-        message(FATAL_ERROR "Could not find MySQL headers.")
-    endif(MYSQL_FOUND)
-else()
-    include_directories("${LIBRARY_DIR}/external/MySQL/")
-    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-        # 32 bit link
-        link_directories(${LIBRARY_DIR}/external/MySQL/x86)
-        link_directories(${LIBRARY_DIR}/external/zlib/x86)
-    else()
-        # 64 bit link
-        link_directories(${LIBRARY_DIR}/external/MySQL/x64)
-        link_directories(${LIBRARY_DIR}/external/zlib/x64)
-    endif()
-endif()