From 2da53c4c1aa5c8275108e58f3c9e169df98b63c8 Mon Sep 17 00:00:00 2001 From: coolzoom Date: Wed, 11 Oct 2023 00:33:22 +0800 Subject: [PATCH] CMake: dropped unsupported MySQL versions from FindMySQL macro (#424) --- cmake/macros/FindMySQL.cmake | 3 --- src/server/bnetserver/bnetserver.conf.dist | 2 +- src/server/worldserver/worldserver.conf.dist | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 0992f38641..f5eee4b6b0 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -143,9 +143,6 @@ if(WIN32) "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1/lib/opt" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/lib/opt" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" diff --git a/src/server/bnetserver/bnetserver.conf.dist b/src/server/bnetserver/bnetserver.conf.dist index cab9e721cc..ef8d4cb210 100644 --- a/src/server/bnetserver/bnetserver.conf.dist +++ b/src/server/bnetserver/bnetserver.conf.dist @@ -141,7 +141,7 @@ SourceDirectory = "" # MySQLExecutable # Description: The path to your mysql cli binary. # If the path is left empty, built-in path from cmake is used. -# Example: "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe" +# Example: "C:/Program Files/MySQL/MySQL Server 5.7/bin/mysql.exe" # "mysql.exe" # "/usr/bin/mysql" # Default: "" diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index a8e5e25c64..abc0d677a6 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -216,7 +216,7 @@ SourceDirectory = "" # MySQLExecutable # Description: The path to your mysql cli binary. # If the path is left empty, built-in path from cmake is used. -# Example: "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe" +# Example: "C:/Program Files/MySQL/MySQL Server 5.7/bin/mysql.exe" # "mysql.exe" # "/usr/bin/mysql" # Default: ""