From 6baf3f9a597bc66f645cf36e3ccb0284a9df9026 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sat, 7 Aug 2010 21:48:20 +0200
Subject: Buildsystem/CMake: Adjust headerlocations on Windows so that they are
 correctly detected. - Remove caching of OpenSSL info (for you, zor!) - Adjust
 MySQL header-location in a DB-file (haha to Machiavelli, more work for you!)
 - Add OpenSSL-header location to the shared-library (Fixes build)

--HG--
branch : trunk
---
 src/server/shared/CMakeLists.txt         | 1 +
 src/server/shared/Database/QueryResult.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/server/shared/Database/QueryResult.h

(limited to 'src')

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index be46386813c..02d9122b66b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -92,6 +92,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/shared/Threading
   ${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
   ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${OPENSSL_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
 )
 
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
old mode 100644
new mode 100755
index 5562a9abfa4..0c87025843d
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -29,7 +29,7 @@
 #ifdef _WIN32
 #define FD_SETSIZE 1024
 #include <winsock2.h>
-#include <mysql/mysql.h>
+#include <mysql.h>
 #else
 #include <mysql.h>
 #endif
-- 
cgit v1.2.3