mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 10:13:51 +01:00
fix FindMySQL.cmake
This commit is contained in:
parent
24e48e001e
commit
d79c8e4a2f
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user