From 638ece57e39b4e9f8b960b781001538cee4a77ce Mon Sep 17 00:00:00 2001 From: segoon Date: Sun, 15 Dec 2024 17:22:49 +0300 Subject: [PATCH] feat cmake: add postgresql search directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------------------ Tests: протестировано CI Pull Request resolved: commit_hash:8f51c552919e9f90aa1a7c074c08717dcb70c930 --- cmake/modules/FindPostgreSQLInternal.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/modules/FindPostgreSQLInternal.cmake b/cmake/modules/FindPostgreSQLInternal.cmake index 747f0962a305..2b6c652e3dbf 100644 --- a/cmake/modules/FindPostgreSQLInternal.cmake +++ b/cmake/modules/FindPostgreSQLInternal.cmake @@ -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 ) @@ -31,9 +32,11 @@ _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( @@ -41,6 +44,7 @@ _userver_module_find_include( PATHS ${USERVER_PG_INCLUDE_DIR} /usr/local/include # FreeBSD + /usr/local/pgsql/include # postgresql: make install PATH_SUFFIXES postgresql pgsql @@ -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( @@ -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( @@ -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()