diff --git a/src/engine-config.h.in b/src/engine-config.h.in index d3f20d595..467ad3045 100644 --- a/src/engine-config.h.in +++ b/src/engine-config.h.in @@ -21,3 +21,5 @@ #cmakedefine OPENCL_LIBRARY "@OPENCL_LIBRARY@" #cmakedefine BASE_URL "@BASE_URL@" #cmakedefine DB_PW "@DB_PW@" + +#cmakedefine POSTGRESQL_LIBS "@POSTGRESQL_LIBS@" diff --git a/src/modules/persistence/CMakeLists.txt b/src/modules/persistence/CMakeLists.txt index bb82b2981..82362bc6d 100644 --- a/src/modules/persistence/CMakeLists.txt +++ b/src/modules/persistence/CMakeLists.txt @@ -50,6 +50,7 @@ else() message(WARNING "No postgres was found on your system. Make sure to have libpq and pg_type.h installed on your system") endif() set(HAVE_POSTGRES ${PostgreSQL_FOUND} CACHE BOOL "Found postgres" FORCE) +set(POSTGRESQL_LIBS "${PostgreSQL_LIBRARIES}" CACHE STRING "PostgreSQL libraries" FORCE) message(STATUS "Postgresql include dirs: ${PostgreSQL_INCLUDE_DIRS}") message(STATUS "Postgresql libs: ${PostgreSQL_LIBRARIES}") diff --git a/src/modules/persistence/postgres/PQSymbol.cpp b/src/modules/persistence/postgres/PQSymbol.cpp index ca8a97743..484ab8072 100644 --- a/src/modules/persistence/postgres/PQSymbol.cpp +++ b/src/modules/persistence/postgres/PQSymbol.cpp @@ -67,7 +67,11 @@ bool postgresInit() { } if (obj == nullptr) { - const char *searchPaths[] = {"libpq.so", nullptr}; + const char *searchPaths[] = { +#ifdef POSTGRESQL_LIBS + POSTGRESQL_LIBS +#endif + "libpq.so", nullptr}; for (const char **searchPath = searchPaths; *searchPath; ++searchPath) { obj = SDL_LoadObject(*searchPath); if (obj != nullptr) {