diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake index e45a4450cea..cb9963b06e9 100644 --- a/cmake/FindPostgres.cmake +++ b/cmake/FindPostgres.cmake @@ -61,6 +61,13 @@ ENDIF(WIN32) IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) SET(POSTGRES_FOUND TRUE) + + IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") + SET(HAVE_PGCONFIG TRUE) + ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") + SET(HAVE_PGCONFIG FALSE) + ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") + ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 3950c08b027..90c6bc432c2 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -140,6 +140,10 @@ SET (QGIS_APP_MOC_HDRS ) IF (POSTGRES_FOUND) + IF(HAVE_PGCONFIG) + ADD_DEFINITIONS(-DHAVE_PGCONFIG=1) + ENDIF(HAVE_PGCONFIG) + SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} qgsdbsourceselect.cpp qgsnewconnection.cpp diff --git a/src/app/qgsdbsourceselect.cpp b/src/app/qgsdbsourceselect.cpp index 35ec46f7e59..d78ac18241b 100644 --- a/src/app/qgsdbsourceselect.cpp +++ b/src/app/qgsdbsourceselect.cpp @@ -38,7 +38,9 @@ email : sherman at mrcc.com #include #include +#ifdef HAVE_PGCONFIG #include +#endif QgsDbSourceSelect::QgsDbSourceSelect( QWidget *parent, Qt::WFlags fl ) : QDialog( parent, fl ), mColumnTypeThread( NULL ), pd( 0 )