Skip to content

Update PR of Oliver #182

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

Closed
peremato wants to merge 2 commits into from
Closed

Update PR of Oliver #182

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519b148
FindPostgreSQL.cmake: Add PATH_SUFFIX for searching.
olifre Apr 12, 2016
c09fb37
Use further PATH_SUFFIX to clean module
peremato Jun 21, 2016
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
30 changes: 4 additions & 26 deletions cmake/modules/FindPostgreSQL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,13 @@


find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h
PATHS ${POSTGRESQL_DIR}/include $ENV{POSTGRESQL_DIR}/include
"/usr/include/pgsql/"
"/usr/local/include/pgsql/"
"/usr/include/postgresql/"
"/usr/local/include/pgsql/server"
"/usr/local/include/postgresql/server"
"/usr/local/include/postgresql/*/server"
"/usr/local/pgsql/postgresql/server"
"/usr/local/pgsql/postgresql/*/server"
"/usr/local/*/include/"
"/usr/local/*/include/postgresql/"
"/usr/local/*/include/postgresql/server"
"/usr/include/server"
"/usr/include/pgsql/server"
"/usr/include/postgresql/server"
"/usr/include/postgresql/*/server"
HINTS ${POSTGRESQL_DIR}/include $ENV{POSTGRESQL_DIR}/include
PATH_SUFFIXES pgsql pgsql/server postgresql postgresql/server
)

find_library(POSTGRESQL_LIBRARY NAMES pq
PATHS ${POSTGRESQL_DIR}/lib $ENV{POSTGRESQL_DIR}/lib
"/usr/lib/"
"/usr/lib64/"
"/usr/local/lib/"
"/usr/local/lib64/"
"/usr/lib/*/"
"/usr/local/*/"
"/usr/lib/posgresql/"
"/usr/lib64/posgresql/"
HINTS ${POSTGRESQL_DIR}/lib $ENV{POSTGRESQL_DIR}/lib
PATH_SUFFIXES pgsql posgresql
)

if(POSTGRESQL_LIBRARY)
Expand All @@ -51,4 +30,3 @@ find_package_handle_standard_args(PostgreSQL DEFAULT_MSG
POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARY)

mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARY)