[Cmake-commits] CMake branch, next, updated. v2.8.9-793-gddd14f2

[David Cole]

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  ddd14f2c8852c38e5fd2681391d2b6b7d742c9a5 (commit)
       via  8b7a5c616642d4636cb1c6ebfae1f16af0d6d606 (commit)
       via  7892c87464f1d02717b971703ac375010ab8f30d (commit)
      from  0f123bc3fc1f176847c8bdf59e8e47f7341273e9 (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=ddd14f2c8852c38e5fd2681391d2b6b7d742c9a5
commit ddd14f2c8852c38e5fd2681391d2b6b7d742c9a5
Merge: 0f123bc 8b7a5c6
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 27 01:11:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 27 01:11:01 2012 -0400

    Merge topic 'fix-13549-make-findmpi-quiet' into next
    
    8b7a5c6 FindMPI: Set correct variables for calls to FPHSA
    7892c87 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b7a5c616642d4636cb1c6ebfae1f16af0d6d606
commit 8b7a5c616642d4636cb1c6ebfae1f16af0d6d606
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 27 00:41:28 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 27 00:41:28 2012 -0400

    FindMPI: Set correct variables for calls to FPHSA
    
    Since FPHSA is called for multiple compiler languages with "MPI_${lang}"
    rather than just "MPI", make sure variables for controlling QUIET,
    REQUIRED and VERSION are propagated with names prefixed by MPI_${lang}
    as well, rather than just MPI.
    
    The find_package call sets up the values of MPI_FIND_REQUIRED and friends,
    but these calls to FPHSA need MPI_${lang}_FIND_REQUIRED and friends in
    order to function as intended.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index ae50ca7..4ce4de9 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -576,6 +576,11 @@ foreach (lang C CXX Fortran)
       try_regular_compiler(${lang} regular_compiler_worked)
     endif()
 
+    set(MPI_${lang}_FIND_QUIETLY ${MPI_FIND_QUIETLY})
+    set(MPI_${lang}_FIND_REQUIRED ${MPI_FIND_REQUIRED})
+    set(MPI_${lang}_FIND_VERSION ${MPI_FIND_VERSION})
+    set(MPI_${lang}_FIND_VERSION_EXACT ${MPI_FIND_VERSION_EXACT})
+
     if (regular_compiler_worked)
       find_package_handle_standard_args(MPI_${lang} DEFAULT_MSG MPI_${lang}_COMPILER)
     else()

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

Summary of changes:
 Modules/FindMPI.cmake     |    5 +++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake