[Cmake-commits] CMake branch, next, updated. v2.8.7-2105-g74d2757

Brad King brad.king at kitware.com
Mon Jan 16 09:28:28 EST 2012


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  74d2757c6ffbd4012d566143c66cdcaf3e896f54 (commit)
       via  87737e62e0e6f1bb3c54ea0052f2fc19ded16c15 (commit)
      from  5dd320e9e9b27deb83dcb624a935de7f78482226 (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=74d2757c6ffbd4012d566143c66cdcaf3e896f54
commit 74d2757c6ffbd4012d566143c66cdcaf3e896f54
Merge: 5dd320e 87737e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 09:28:21 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 09:28:21 2012 -0500

    Merge topic 'FindMPI-issue-12874' into next
    
    87737e6 FindMPI: Append MPI C++ library correctly in non-compiler case (#12874)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87737e62e0e6f1bb3c54ea0052f2fc19ded16c15
commit 87737e62e0e6f1bb3c54ea0052f2fc19ded16c15
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 09:03:08 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 09:03:08 2012 -0500

    FindMPI: Append MPI C++ library correctly in non-compiler case (#12874)
    
    When we have no MPI compiler wrapper and search explicitly for the MPI
    C++ library append it correctly to the list of libraries instead of
    using a space.
    
    Suggested-by: Mourad Boufarguine <bouffa at gmail.com>

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 250d8a6..1be4ccf 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -413,7 +413,7 @@ function (interrogate_mpi_compiler lang try_libs)
           HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
           PATH_SUFFIXES lib)
         if (MPI_LIBRARIES_WORK AND MPI_LIB)
-          set(MPI_LIBRARIES_WORK "${MPI_LIBRARIES_WORK} ${MPI_LIB}")
+          list(APPEND MPI_LIBRARIES_WORK ${MPI_LIB})
         endif()
       endif()
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list