From aafc47374667d51bed45fa9a83b86ea4b95e84d3 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 29 Aug 2018 09:15:56 +0200
Subject: [PATCH] PgSQL: add support for PostgreSQL_CONFIG cmake var

UPSTREAM: https://github.com/rdkit/rdkit/pull/2014

This is useful for installations where pg_config is renamed to not
collide with the system default pg_config name.

We should drop 'find_package(PostgreSQL REQUIRED)' statement in
future because that's supposed to find PostgreSQL client library
to build against, not PostgreSQL server.  It might happen that
PostgreSQL server on the system is of different version than libpq
(Debian), but in future it will be problematic also on Fedora
(rhbz#1618698).

See also: https://gitlab.kitware.com/cmake/cmake/issues/17223
---
 Code/PgSQL/rdkit/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Code/PgSQL/rdkit/CMakeLists.txt b/Code/PgSQL/rdkit/CMakeLists.txt
index ccd1d77f..b0bd2f70 100644
--- a/Code/PgSQL/rdkit/CMakeLists.txt
+++ b/Code/PgSQL/rdkit/CMakeLists.txt
@@ -47,13 +47,16 @@ endif(NOT DEFINED PostgreSQL_ROOT)
 if(NOT DEFINED PostgreSQL_CONFIG_DIR)
   set(PostgreSQL_CONFIG_DIR "${PostgreSQL_ROOT}/bin")
 endif(NOT DEFINED PostgreSQL_CONFIG_DIR)
+if(NOT DEFINED PostgreSQL_CONFIG)
+  set(PostgreSQL_CONFIG "${PostgreSQL_CONFIG_DIR}/pg_config")
+endif(NOT DEFINED PostgreSQL_CONFIG)
 macro (run_pg_config arg var)
-  execute_process(COMMAND ${PostgreSQL_CONFIG_DIR}/pg_config ${arg}
+  execute_process(COMMAND ${PostgreSQL_CONFIG} ${arg}
                   RESULT_VARIABLE pgsql_config_result
                   OUTPUT_VARIABLE ${var}
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
   if(NOT ${pgsql_config_result} EQUAL 0 OR NOT ${var})
-    message(FATAL_ERROR "${PostgreSQL_CONFIG_DIR}/pg_config ${arg} failed")
+    message(FATAL_ERROR "${PostgreSQL_CONFIG} ${arg} failed")
   endif()
 endmacro ()
 run_pg_config (--bindir PG_BINDIR)
-- 
2.17.1