Skip to content
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

Add postgresql install dirs to search #788

Closed
wants to merge 2 commits into from
Closed

Add postgresql install dirs to search #788

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add97a6
add postgresql default installation paths for search
RayeS2070 Dec 13, 2024
ab42faa
fix libpq-int.h path
RayeS2070 Dec 13, 2024
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
7 changes: 7 additions & 0 deletions cmake/modules/FindPostgreSQLInternal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ _userver_module_find_include(
/usr/include/postgresql/20/server
/usr/local/include/postgresql/server # FreeBSD
/usr/include/postgresql/server # Manjaro
/usr/local/pgsql/include/server # postgresql: make install
PATH_SUFFIXES
pgsql/server # postgresql-server-devel
)
Expand All @@ -31,16 +32,19 @@ _userver_module_find_include(
${USERVER_PG_INCLUDE_DIR}/internal
${USERVER_PG_INCLUDE_DIR}/postgresql/internal
/usr/local/include/postgresql/internal # FreeBSD
/usr/local/pgsql/include/internal # postgresql: make install
PATH_SUFFIXES
postgresql/internal # libpq-dev
pgsql/internal # postgresql-private-devel

)

_userver_module_find_include(
NAMES libpq-fe.h
PATHS
${USERVER_PG_INCLUDE_DIR}
/usr/local/include # FreeBSD
/usr/local/pgsql/include # postgresql: make install
PATH_SUFFIXES
postgresql
pgsql
Expand All @@ -51,6 +55,7 @@ _userver_module_find_library(
PATHS
${USERVER_PG_LIBRARY_DIR}
/usr/local/lib # FreeBSD
/usr/local/pgsql/lib # postgresql: make install
)

_userver_module_find_library(
Expand All @@ -67,6 +72,7 @@ _userver_module_find_library(
/usr/lib/postgresql/18/lib
/usr/lib/postgresql/19/lib
/usr/lib/postgresql/20/lib
/usr/local/pgsql/lib # postgresql: make install
)

_userver_module_find_library(
Expand All @@ -83,6 +89,7 @@ _userver_module_find_library(
/usr/lib/postgresql/18/lib
/usr/lib/postgresql/19/lib
/usr/lib/postgresql/20/lib
/usr/local/pgsql/lib # postgresql: make install
)

_userver_module_end()
Loading