From d79c8e4a2fa4143530910dcafdd08d011a7e0b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Wed, 4 Oct 2023 10:09:55 +0200 Subject: [PATCH] fix FindMySQL.cmake --- cmake/FindMySQL.cmake | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 860dca90b..614c66778 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -26,7 +26,7 @@ pkg_check_modules(PC_MARIADB QUIET mariadb) SET(BINDIR32_ENV_NAME "ProgramFiles(x86)") SET(BINDIR32 $ENV{${BINDIR32_ENV_NAME}}) -find_path(MYSQL_INCLUDE_DIR mysql.h +find_path(MYSQL_INCLUDE_DIR mysql/mysql.h HINTS ${MYSQL_ROOT_DIR}/include ${MYSQL_ROOT_INCLUDE_DIRS} @@ -35,11 +35,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h ${PC_MARIADB_INCLUDE_DIRS} /usr/include /usr/local/include - /usr/mysql/include - /usr/local/mysql/include - /usr/local/opt/mysql-client/include - /opt/local/include - /opt/mysql/include + /opt/mysql/mysql/include + /usr/local/mysql/include $ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_DIR}/include $ENV{ProgramFiles}/MySQL/*/include @@ -71,13 +68,6 @@ if (MSVC) PATHS ${PC_MYSQL_LIBRARY_DIRS} ${PC_MARIADB_LIBRARY_DIRS} - /usr/local/lib - /usr/local/lib$(LIB64SUFFIX)/mysql - /usr/lib$(LIB64SUFFIX)/mysql - /usr/mysql/lib$(LIB64SUFFIX) - /usr/mysql/lib$(LIB64SUFFIX)/mysql - /usr/local/mysql/lib$(LIB64SUFFIX) - /usr/local/opt/mysql-client/lib $ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/libmysql $ENV{MYSQL_DIR}/client