diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
| commit | 741f3dde2e880baf3439fe60f7166cea14b70196 (patch) | |
| tree | c7f49c46c258d1a587dee4b4367f5436a833c93e /cmake/platform | |
| parent | 67fc6a9b42879bc6ea9010293780d4f82d9cb09e (diff) | |
| parent | febb26d4b711762b1ee605705e7fa949b9871df1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
src/server/game/Spells/Auras/SpellAuras.cpp
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/win/settings.cmake | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake index f57f84c6a45..c68d7bc51cc 100644 --- a/cmake/platform/win/settings.cmake +++ b/cmake/platform/win/settings.cmake @@ -1,17 +1,7 @@ -# Platform-specfic options -option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1) - # Package overloads set(BZIP2_LIBRARIES "bzip2") set(ZLIB_LIBRARIES "zlib") -if( USE_MYSQL_SOURCES ) - set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include) - set(MYSQL_LIBRARY "libmysql") - set( MYSQL_FOUND 1 ) - message(STATUS "Using supplied MySQL sources") -endif() - # check the CMake preload parameters (commented out by default) # overload CMAKE_INSTALL_PREFIX if not being set properly |