From d9d09574be1d0afa0609626d3bd6f604be31b8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 8 Nov 2017 16:54:37 +0100
Subject: [PATCH] Improve code to lookup PostgreSQL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 cmake/FindPostgres.cmake | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake
index eeea7f2644..56435c0603 100644
--- a/cmake/FindPostgres.cmake
+++ b/cmake/FindPostgres.cmake
@@ -39,6 +39,8 @@ ELSE(WIN32)
     FIND_PROGRAM(POSTGRES_CONFIG pg_config
       ${POSTGRES_CONFIG_PREFER_PATH}
       /usr/bin/
+      "$ENV{POSTGRES_HOME}/bin"
+      "$ENV{POSTGRES_PATH}/bin"
       )
     # MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")
     
@@ -47,6 +49,10 @@ ELSE(WIN32)
       EXEC_PROGRAM(${POSTGRES_CONFIG}
         ARGS --includedir
         OUTPUT_VARIABLE PG_TMP)
+    ELSE(POSTGRES_CONFIG)
+      SET(PG_TMP /opt/postgresql) 
+    ENDIF(POSTGRES_CONFIG)
+
       find_path(POSTGRES_INCLUDE_DIR libpq-fe.h
             /usr/local/include
             /usr/local/include/postgresql 
@@ -55,6 +61,10 @@ ELSE(WIN32)
             /usr/include 
             /usr/include/postgresql
             ${PG_TMP}
+            $ENV{POSTGRESQL_HOME}/include/server
+            $ENV{POSTGRESQL_HOME}/include
+            $ENV{POSTGRESQL_PATH}/include/server
+            $ENV{POSTGRESQL_PATH}/include
       )
 
       # set LIBRARY_DIR
@@ -68,8 +78,9 @@ ELSE(WIN32)
         /usr/local/lib
         /usr/local/lib/postgresql
         /usr/local/postgresql/lib
+        $ENV{POSTGRESQL_HOME}/lib
+        $ENV{POSTGRESQL_PATH}/lib
       )
-    ENDIF(POSTGRES_CONFIG)
 
   ENDIF(UNIX)
 ENDIF(WIN32)