From dc021ae25cb85a842f04edbedc308084ecdb770f Mon Sep 17 00:00:00 2001
From: Alex Fabijanic <alex@pocoproject.org>
Date: Mon, 7 May 2018 11:50:39 -0500
Subject: [PATCH] Postgres Linux and cmake build

---
 CMakeLists.txt                     |  1 +
 Data/CMakeLists.txt                | 13 +++++++++++++
 Data/PostgreSQL/Makefile           |  4 ++--
 Data/PostgreSQL/testsuite/Makefile |  2 +-
 components                         |  1 +
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f8a2a6f1..14a3d380c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,7 @@ option(ENABLE_CRYPTO "Enable Crypto" ON)
 option(ENABLE_DATA "Enable Data" ON)
 option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON)
 option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON)
+option(ENABLE_DATA_POSTGRESQL "Enable Data PostgreSQL" ON)
 option(ENABLE_DATA_ODBC "Enable Data ODBC" ON)
 option(ENABLE_SEVENZIP "Enable SevenZip" OFF)
 option(ENABLE_ZIP "Enable Zip" ON)
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
index ab77443cf..975d2937e 100644
--- a/Data/CMakeLists.txt
+++ b/Data/CMakeLists.txt
@@ -55,6 +55,19 @@ if(ENABLE_DATA_MYSQL)
     endif(MYSQL_FOUND)
 endif(ENABLE_DATA_MYSQL)
 
+if(ENABLE_DATA_POSTGRESQL)
+    find_package(PostgreSQL)
+    if(POSTGRESQL_FOUND)
+        include_directories("${PostgreSQL_INCLUDE_DIR}")
+        if(POCO_VERBOSE_MESSAGES)
+            message(STATUS "PostgreSQL Support Enabled")
+        endif()
+        add_subdirectory( PostgreSQL )
+    elseif(POCO_VERBOSE_MESSAGES)
+        message(STATUS "PostgreSQL Support Disabled - no PostgreSQL library")
+    endif(POSTGRESQL_FOUND)
+endif(ENABLE_DATA_POSTGRESQL)
+
 if(ENABLE_DATA_ODBC)
     find_package(ODBC)
     if(WIN32 AND NOT WINCE)
diff --git a/Data/PostgreSQL/Makefile b/Data/PostgreSQL/Makefile
index 77965fda8..8e95b8f42 100644
--- a/Data/PostgreSQL/Makefile
+++ b/Data/PostgreSQL/Makefile
@@ -14,8 +14,8 @@ objects = Extractor Binder SessionImpl Connector \
 	PostgreSQLStatementImpl PostgreSQLException \
 	SessionHandle StatementExecutor PostgreSQLTypes Utility
 
-target         = PocoSQLPostgreSQL
+target         = PocoDataPostgreSQL
 target_version = $(LIBVERSION)
-target_libs    = PocoSQL PocoFoundation
+target_libs    = PocoData PocoFoundation
 
 include $(POCO_BASE)/build/rules/lib
diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile
index 4fba463e2..781ea7113 100644
--- a/Data/PostgreSQL/testsuite/Makefile
+++ b/Data/PostgreSQL/testsuite/Makefile
@@ -17,6 +17,6 @@ objects = PostgreSQLTestSuite Driver PostgreSQLTest SQLExecutor
 
 target         = testrunner
 target_version = 1
-target_libs    = PocoSQLPostgreSQL PocoSQL PocoFoundation PocoCppUnit
+target_libs    = PocoDataPostgreSQL PocoData PocoFoundation CppUnit
 
 include $(POCO_BASE)/build/rules/exec
diff --git a/components b/components
index e92d2748b..e4402eaad 100644
--- a/components
+++ b/components
@@ -13,6 +13,7 @@ Data
 Data/SQLite
 Data/ODBC
 Data/MySQL
+Data/PostgreSQL
 Zip
 PageCompiler
 PageCompiler/File2Page