3 files changed, 31 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt
index 95e696f48b..cc39a0fe35 100644
--- a/src/plugins/sqldrivers/CMakeLists.txt
+++ b/src/plugins/sqldrivers/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_feature_module_end(NO_MODULE)
 
 
 if(QT_FEATURE_sql_psql)
-#     TODO add_subdirectory(psql)
+    add_subdirectory(psql)
 endif()
 
 if(QT_FEATURE_sql_mysql)
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
index 626a835f0a..8b349a160d 100644
--- a/src/plugins/sqldrivers/configure.cmake
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -6,6 +6,8 @@
 
 #### Libraries
 
+find_package(PostgreSQL)
+set_package_properties(PostgreSQL PROPERTIES TYPE OPTIONAL)
 find_package(SQLite3)
 set_package_properties(SQLite3 PROPERTIES TYPE OPTIONAL)
 
@@ -38,7 +40,7 @@ qt_feature("sql_odbc" PRIVATE
 )
 qt_feature("sql_psql" PRIVATE
     LABEL "PostgreSQL"
-    CONDITION libs.psql OR FIXME
+    CONDITION PostgreSQL_FOUND
 )
 qt_feature("sql_sqlite2" PRIVATE
     LABEL "SQLite2"
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
new file mode 100644
index 0000000000..f87a8108b1
--- /dev/null
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from psql.pro.
+
+# FIXME cmake FindPostgreSQL is more exhaustive than the check we have for libpq-fe.h
+# it also checks for catalog/pg_type.h which is a more internal include, we should
+# add a way to tell cmake FindPostgreSQL to optionally only look for the libpq-fe.h one
+find_package(PostgreSQL)
+
+#####################################################################
+## qsqlpsql Plugin:
+#####################################################################
+
+add_qt_plugin(qsqlpsql
+    TYPE sqldrivers
+    SOURCES
+        main.cpp
+        qsql_psql.cpp qsql_psql_p.h
+    DEFINES
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_ASCII
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::SqlPrivate
+        PostgreSQL::PostgreSQL
+    # OTHER_FILES = "psql.json"
+    # PLUGIN_CLASS_NAME = "QPSQLDriverPlugin"
+    # _LOADED = "qt_plugin"
+)