From b386971229f5ad389be9e22cbb96c39d79ac7beb Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 30 Aug 2025 19:25:47 +0200 Subject: Dep/MySQL: Move required version checks to CMake, raise required version to 8.0.34 and remove strict compiled<->runtime version match requirement from non-Windows platforms --- dep/mysql/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dep') diff --git a/dep/mysql/CMakeLists.txt b/dep/mysql/CMakeLists.txt index a30b0f738f4..dd9b7c9f1b3 100644 --- a/dep/mysql/CMakeLists.txt +++ b/dep/mysql/CMakeLists.txt @@ -8,10 +8,17 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -find_package(MySQL REQUIRED COMPONENTS lib) +set(MYSQL_MIN_VERSION_MySQL 8.0.34) +set(MYSQL_MIN_VERSION_MariaDB 10.4) +find_package(MySQL COMPONENTS lib) add_library(mysql INTERFACE) +target_compile_definitions(mysql + INTERFACE + TRINITY_MYSQL_FLAVOR="${MYSQL_FLAVOR}" + TRINITY_REQUIRED_MYSQL_VERSION="${MYSQL_MIN_VERSION_${MYSQL_FLAVOR}}") + target_link_libraries(mysql INTERFACE MySQL::MySQL) -- cgit v1.2.3