diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-12 14:26:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-12 14:28:05 (GMT) |
| commit | 0a52bada333ca968f6eef36076fe2df3f5cef051 (patch) | |
| tree | e70e5eb7662a317940618ab72cf5bd47d9886fa2 | |
| parent | 3f10e564e04f1c619fcdc2c2fd4584961c46f9ec (diff) | |
| parent | ec43d96657d3cc5d3a54555c6cbd0c1619c787ca (diff) | |
| download | CMake-0a52bada333ca968f6eef36076fe2df3f5cef051.zip CMake-0a52bada333ca968f6eef36076fe2df3f5cef051.tar.gz CMake-0a52bada333ca968f6eef36076fe2df3f5cef051.tar.bz2 | |
Merge topic 'FindPostgreSQL-macports-and-v12'
ec43d96657 FindPostgreSQL: support macports installation scheme
908dff41c6 FindPostgreSQL: support version 12
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3907
| -rw-r--r-- | Modules/FindPostgreSQL.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index dfece22..cfa4ebc 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -87,7 +87,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} - "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") # Define additional search paths for root directories. set( PostgreSQL_ROOT_DIRECTORIES @@ -107,8 +107,11 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS}) list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES "pgsql-${suffix}/lib") list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES + "postgresql${suffix}" + "postgresql/${suffix}" "pgsql-${suffix}/include") list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES + "postgresql${suffix}/server" "postgresql/${suffix}/server" "pgsql-${suffix}/include/server") endif() |