This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4b74150218a9c0ab28070d10c87f4391b724bba6 (commit)
via 5ffee691ee0c55d043238960cf1149cbcfb86047 (commit)
from 89a350e455008070ec9c4c6ed55e1e4fb681921b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b74150218a9c0ab28070d10c87f4391b724bba6
commit 4b74150218a9c0ab28070d10c87f4391b724bba6
Merge: 89a350e 5ffee69
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 09:53:50 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 09:53:50 2017 -0500
Merge topic 'pgsql-yum' into next
5ffee691 FindPostgreSQL: automatically find installations from
yum.postgresql.org
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ffee691ee0c55d043238960cf1149cbcfb86047
commit 5ffee691ee0c55d043238960cf1149cbcfb86047
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Thu Dec 29 11:05:36 2016 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 09:52:42 2017 -0500
FindPostgreSQL: automatically find installations from yum.postgresql.org
In commit v3.3.0-rc1~4^2 (FindPostgreSQL: Search some more common
packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was
removed. This was used e.g. by osm2pgsql to be able to build on CentOS
with recent PostgreSQL versions. At least add those locations from
yum.postgresql.org, which is a more or less official location.
diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 874128c..9e2194c 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -88,8 +88,13 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS})
"PostgreSQL/${suffix}/include/server")
endif()
if(UNIX)
+ list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
+ "pgsql-${suffix}/lib")
+ list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
+ "pgsql-${suffix}/include")
list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
- "postgresql/${suffix}/server")
+ "postgresql/${suffix}/server"
+ "pgsql-${suffix}/include/server")
endif()
endforeach()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPostgreSQL.cmake | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
