summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ConfigureChecks.cmake21
-rw-r--r--amarok/src/CMakeLists.txt1
2 files changed, 17 insertions, 5 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index cfee3236..44ea0682 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -344,15 +344,26 @@ endif( WITH_MYSQL )
if( WITH_POSTGRESQL )
##### check for PostgreSQL
-message( STATUS "Check for PostgreSQL" )
-find_package( PostgreSQL )
-if( PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY )
+ message( STATUS "Check for PostgreSQL" )
+ find_package( PostgreSQL )
+
+ if( PostgreSQL_INCLUDE_DIR AND PostgreSQL_LIBRARY )
message( STATUS " includes ${PostgreSQL_INCLUDE_DIR} ")
message( STATUS " library ${PostgreSQL_LIBRARY} ")
set( USE_POSTGRESQL 1 )
else()
- tde_message_fatal( "Postgresql support is requested but Postgresql was not found on your system." )
-endif()
+ pkg_search_module( LIBPQ libpq )
+
+ if( NOT LIBPQ_FOUND )
+ tde_message_fatal( "Postgresql support is requested but Postgresql was not found on your system." )
+ endif()
+
+ set( PostgreSQL_INCLUDE_DIR "${LIBPQ_INCLUDE_DIRS}" )
+ set( PostgreSQL_LIBRARY "${LIBPQ_LIBRARIES}" )
+ set( PostgreSQL_LIBRARY_DIRS "${LIBPQ_LIBRARY_DIRS}" )
+ set( USE_POSTGRESQL 1 )
+ endif()
+
endif( WITH_POSTGRESQL )
diff --git a/amarok/src/CMakeLists.txt b/amarok/src/CMakeLists.txt
index b684d94b..07fb0e9d 100644
--- a/amarok/src/CMakeLists.txt
+++ b/amarok/src/CMakeLists.txt
@@ -49,6 +49,7 @@ include_directories(
link_directories(
${TQT_LIBRARY_DIRS}
+ ${PostgreSQL_LIBRARY_DIRS}
)