diff --git a/cmake/mariadb.cmake b/cmake/mariadb.cmake index 33d15c3..e3e95e1 100644 --- a/cmake/mariadb.cmake +++ b/cmake/mariadb.cmake @@ -14,10 +14,13 @@ IF (WIN32) FIND_PATH(MARIADB_INCLUDE_DIR mysql.h $ENV{PROGRAMFILES}/MariaDB*/include $ENV{SYSTEMDRIVE}/MariaDB*/include) -ELSE () +ELSEIF (LINUX) FIND_PATH(MARIADB_INCLUDE_DIR mysql.h /usr/local/include/mariadb /usr/include/mariadb) +ELSEIF (APPLE) + FIND_PATH(MARIADB_INCLUDE_DIR mysql.h + /opt/homebrew/include/mariadb) ENDIF() SET(MARIADB_NAMES mariadb) @@ -27,12 +30,17 @@ IF (WIN32) PATHS $ENV{PROGRAMFILES}/MariaDB*/lib $ENV{SYSTEMDRIVE}/MariaDB*/lib PATH_SUFFIXES mariadb) -ELSE () +ELSEIF (LINUX) FIND_LIBRARY(MARIADB_LIBRARY NAMES ${MARIADB_NAMES} PATHS /usr/lib /usr/local/lib PATH_SUFFIXES mariadb) +ELSEIF (APPLE) + FIND_LIBRARY(MARIADB_LIBRARY + NAMES ${MARIADB_NAMES} + PATHS /opt/homebrew/lib + PATH_SUFFIXES mariadb) ENDIF() IF (MARIADB_INCLUDE_DIR AND MARIADB_LIBRARY) diff --git a/cmake/mysql.cmake b/cmake/mysql.cmake index ed33984..23778f8 100644 --- a/cmake/mysql.cmake +++ b/cmake/mysql.cmake @@ -22,7 +22,6 @@ ELSEIF (APPLE) FIND_PATH(MYSQL_INCLUDE_DIR mysql.h /opt/homebrew/include/mysql /opt/homebrew/opt/mysql@8.0/include - /usr/local/Cellar/mysql@8.0/*/include/mysql /opt/homebrew/Cellar/mysql@8.0/*/include/mysql) ENDIF() diff --git a/cmake/pgsql.cmake b/cmake/pgsql.cmake index 65a7d41..7f8846c 100644 --- a/cmake/pgsql.cmake +++ b/cmake/pgsql.cmake @@ -14,11 +14,13 @@ IF (WIN32) FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h $ENV{PROGRAMFILES}/PostgreSQL/*/include $ENV{SYSTEMDRIVE}/PostgreSQL/*/include) -ELSE () +ELSEIF (LINUX) FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h - /opt/homebrew/include/postgresql /usr/local/include/postgresql /usr/include/postgresql) +ELSEIF (APPLE) + FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h + /opt/homebrew/include/postgresql) ENDIF() IF (WIN32) @@ -27,13 +29,17 @@ IF (WIN32) NAMES ${PGSQL_NAMES} PATHS $ENV{PROGRAMFILES}/PostgreSQL/*/lib $ENV{SYSTEMDRIVE}/PostgreSQL/*/lib) -ELSE () +ELSEIF (LINUX) SET(PGSQL_NAMES pq) FIND_LIBRARY(PGSQL_LIBRARY NAMES ${PGSQL_NAMES} PATHS /usr/lib - /usr/local/lib - /opt/homebrew/lib) + /usr/local/lib) +ELSEIF (APPLE) + SET(PGSQL_NAMES pq) + FIND_LIBRARY(PGSQL_LIBRARY + NAMES ${PGSQL_NAMES} + PATHS /opt/homebrew/lib) ENDIF() IF (PGSQL_INCLUDE_DIR AND PGSQL_LIBRARY)