diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-28 21:00:53 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-28 21:00:53 +0200 |
| commit | 3a248fbfec34fe80170dfb8c50b971858fb1e488 (patch) | |
| tree | 4bf46d335d77b77a7abfb5f84f00b2073c6b636b /cmake/macros/FindMySQL.cmake | |
| parent | c0c708cf02631118eaab093c43ab8c0b88dcbae2 (diff) | |
| parent | d6dbe52e64b1e6421b34877acd14b6008de97fa5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/BattlegroundScore.h
Diffstat (limited to 'cmake/macros/FindMySQL.cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 036b8302c75..7650a83c571 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -1,6 +1,6 @@ # # Find the MySQL client includes and library -# +# # This module defines # MYSQL_INCLUDE_DIR, where to find mysql.h @@ -95,7 +95,7 @@ find_path(MYSQL_INCLUDE_DIR if( UNIX ) foreach(LIB ${MYSQL_ADD_LIBRARIES}) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES mysql libmysql ${LIB} PATHS @@ -111,7 +111,7 @@ if( UNIX ) endif( UNIX ) if( WIN32 ) - find_library( MYSQL_LIBRARY + find_library( MYSQL_LIBRARY NAMES libmysql PATHS |