From 908dff41c6a8fc98c77d40c5f3b4e7c34ee46c3d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 11 Oct 2019 11:02:03 -0400 Subject: FindPostgreSQL: support version 12 --- Modules/FindPostgreSQL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index dfece22..5fab46d 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 -- cgit v0.12 From ec43d96657d3cc5d3a54555c6cbd0c1619c787ca Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 11 Oct 2019 11:02:11 -0400 Subject: FindPostgreSQL: support macports installation scheme Macports installs into `include/postgresql${suffix}`. Add this to the list of supported suffixes. Also copy the non-server `postgresql/${suffix}` path. --- Modules/FindPostgreSQL.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake index 5fab46d..cfa4ebc 100644 --- a/Modules/FindPostgreSQL.cmake +++ b/Modules/FindPostgreSQL.cmake @@ -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() -- cgit v0.12