CMake: dropped unsupported MySQL versions from FindMySQL macro (#424)

The-Cataclysm-Preservation-Project · Oct 10, 2023 · 2da53c4 · 2da53c4
1 parent c783cf7
commit 2da53c4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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: ""