diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
index 48937e2ef..e2e557ba6 100644
--- a/cmake/modules/FindPostgreSQL.cmake
+++ b/cmake/modules/FindPostgreSQL.cmake
@@ -124,16 +124,21 @@ if ( WIN32 )
   set (POSTGRESQL_LIBRARY_TO_FIND ${POSTGRESQL_LIB_PREFIX}${POSTGRESQL_LIBRARY_TO_FIND})
 endif()
 
-find_library(POSTGRESQL_LIBRARY
- NAMES ${POSTGRESQL_LIBRARY_TO_FIND}
- PATHS
-   ${POSTGRESQL_ROOT_DIRECTORIES}
- PATH_SUFFIXES
-   lib
-   ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
- # Help the user find it if we cannot.
- DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
-)
+function(__postgresql_find_library _name)
+  find_library(${_name}
+   NAMES ${ARGN}
+   PATHS
+     ${POSTGRESQL_ROOT_DIRECTORIES}
+   PATH_SUFFIXES
+     lib
+     ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES}
+   # Help the user find it if we cannot.
+   DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}"
+  )
+endfunction()
+
+__postgresql_find_library(POSTGRESQL_LIBRARY ${POSTGRESQL_LIBRARY_TO_FIND})
+__postgresql_find_library(POSTGRESQL_LIBRARY_DEBUG ${POSTGRESQL_LIBRARY_TO_FIND}d)
 get_filename_component(POSTGRESQL_LIBRARY_DIR ${POSTGRESQL_LIBRARY} PATH)
 
 if (POSTGRESQL_INCLUDE_DIR)
@@ -169,7 +174,11 @@ set(POSTGRESQL_FOUND  ${POSTGRESQL_FOUND})
 if(POSTGRESQL_FOUND)
   set(POSTGRESQL_INCLUDE_DIRS ${POSTGRESQL_INCLUDE_DIR})
   set(POSTGRESQL_LIBRARY_DIRS ${POSTGRESQL_LIBRARY_DIR})
-  set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
+  if(POSTGRESQL_LIBRARY AND POSTGRESQL_LIBRARY_DEBUG)
+    set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARY} debug ${POSTGRESQL_LIBRARY_DEBUG})
+  else()
+    set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY})
+  endif()
   set(POSTGRESQL_VERSION ${POSTGRESQL_VERSION_STRING})
 endif()