[Cmake-commits] CMake branch, next, updated. v2.8.2-215-g5f5cc85

[Andrew Maclean]

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  5f5cc853a806faa70a15de3364c9133e964eead4 (commit)
       via  56da481eff9ee48942ee1717d2b00ec1a6a9b3db (commit)
      from  87b517d35f04ca66ddf239c0e59eea622d2f7c02 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f5cc853a806faa70a15de3364c9133e964eead4
commit 5f5cc853a806faa70a15de3364c9133e964eead4
Merge: 87b517d 56da481
Author:     Andrew Maclean <a.maclean at cas.edu.au>
AuthorDate: Fri Jul 9 15:33:38 2010 +1000
Commit:     Andrew Maclean <a.maclean at cas.edu.au>
CommitDate: Fri Jul 9 15:33:38 2010 +1000

    Merge branch 'FindPostgreSQL' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56da481eff9ee48942ee1717d2b00ec1a6a9b3db
commit 56da481eff9ee48942ee1717d2b00ec1a6a9b3db
Author:     Andrew Maclean <a.maclean at cas.edu.au>
AuthorDate: Fri Jul 9 15:30:21 2010 +1000
Commit:     Andrew Maclean <a.maclean at cas.edu.au>
CommitDate: Fri Jul 9 15:30:21 2010 +1000

    Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS.

diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 495d0e8..e96e1d9 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -97,13 +97,13 @@ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
 # Define additional search paths for root directories.
 if ( WIN32 )
   foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
-    set(ADDITIONAL_SEARCH_PATHS ${ADDITIONAL_SEARCH_PATHS} "C:/Program Files/PostgreSQL/${suffix}" )
+    set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${PostgreSQL_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/PostgreSQL/${suffix}" )
   endforeach(suffix)
 endif( WIN32 )
 set( PostgreSQL_ROOT_DIRECTORIES
    ${PostgreSQL_ROOT_DIRECTORIES}
    ${PostgreSQL_ROOT}
-   ${ADDITIONAL_SEARCH_PATHS}
+   ${PostgreSQL_ADDITIONAL_SEARCH_PATHS}
 )
 
 #

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindPostgreSQL.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake