Postgres Linux and cmake build

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)

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)

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

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

components

@@ -13,6 +13,7 @@ Data
 Data/SQLite
 Data/ODBC
 Data/MySQL
+Data/PostgreSQL
 Zip
 PageCompiler
 PageCompiler/File2Page