From 64358c858f4848fe0d383ebe72887460c426b430 Mon Sep 17 00:00:00 2001
From: Mateusz Loskot <mateusz@loskot.net>
Date: Thu, 10 Nov 2011 01:07:17 +0000
Subject: [PATCH] Specified several PATHS for find_program to help to find
 pg_config.

---
 src/cmake/modules/FindPostgreSQL.cmake | 32 +++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/cmake/modules/FindPostgreSQL.cmake b/src/cmake/modules/FindPostgreSQL.cmake
index 407b2de3f..8178418cc 100644
--- a/src/cmake/modules/FindPostgreSQL.cmake
+++ b/src/cmake/modules/FindPostgreSQL.cmake
@@ -12,24 +12,30 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-find_program(PG_CONFIG NAMES pg_config DOC "Path to pg_config utility")
+find_program(PG_CONFIG NAMES pg_config
+  PATHS
+  /usr/bin
+  /usr/local/bin
+  $ENV{ProgramFiles}/PostgreSQL/*/bin
+  $ENV{SystemDrive}/PostgreSQL/*/bin
+  DOC "Path to pg_config utility")
 
 if(PG_CONFIG)
-    exec_program(${PG_CONFIG}
-      ARGS "--version"
-      OUTPUT_VARIABLE PG_CONFIG_VERSION)
+  exec_program(${PG_CONFIG}
+    ARGS "--version"
+    OUTPUT_VARIABLE PG_CONFIG_VERSION)
 
-    if(${PG_CONFIG_VERSION} MATCHES "^[A-Za-z]+[ ](.*)$")
-      string(REGEX REPLACE "^[A-Za-z]+[ ](.*)$" "\\1" POSTGRESQL_VERSION "${PG_CONFIG_VERSION}")
-    endif()
+  if(${PG_CONFIG_VERSION} MATCHES "^[A-Za-z]+[ ](.*)$")
+    string(REGEX REPLACE "^[A-Za-z]+[ ](.*)$" "\\1" POSTGRESQL_VERSION "${PG_CONFIG_VERSION}")
+  endif()
 
-    exec_program(${PG_CONFIG}
-      ARGS "--includedir"
-      OUTPUT_VARIABLE PG_CONFIG_INCLUDEDIR)  
+  exec_program(${PG_CONFIG}
+    ARGS "--includedir"
+    OUTPUT_VARIABLE PG_CONFIG_INCLUDEDIR)  
 
-    exec_program(${PG_CONFIG}
-      ARGS "--libdir"
-      OUTPUT_VARIABLE PG_CONFIG_LIBDIR)
+  exec_program(${PG_CONFIG}
+    ARGS "--libdir"
+    OUTPUT_VARIABLE PG_CONFIG_LIBDIR)
 else()
   set(POSTGRESQL_VERSION "unknown")
 endif()