Skip to content

Find PostgreSQL debug library #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mloskot merged 2 commits into from
May 8, 2019
Merged

Find PostgreSQL debug library #729

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1fa9cc
Find PostgreSQL debug library
lebdron May 5, 2019
eab01f7
Merge branch 'master' into fix/find-libpqd
mloskot May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions cmake/modules/FindPostgreSQL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()

Expand Down