[Cmake-commits] CMake branch, next, updated. v2.8.2-842-g23fcc68

[Brad King]

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  23fcc68045e8b2bd2e9824b4b443ca85ceddde5d (commit)
       via  a56969f3d3dcd6f711b8f1881f0258ec4a333373 (commit)
      from  3f981c48db9ba772412339ac80e14beb6efdb275 (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=23fcc68045e8b2bd2e9824b4b443ca85ceddde5d
commit 23fcc68045e8b2bd2e9824b4b443ca85ceddde5d
Merge: 3f981c4 a56969f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 20 09:11:05 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 20 09:11:05 2010 -0400

    Merge topic 'FindMPI-f-flags' into next
    
    a56969f FindMPI: Recoginze -f flags from mpicc (#10771)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a56969f3d3dcd6f711b8f1881f0258ec4a333373
commit a56969f3d3dcd6f711b8f1881f0258ec4a333373
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 9 15:29:05 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 20 09:08:08 2010 -0400

    FindMPI: Recoginze -f flags from mpicc (#10771)
    
    Parse compiler flags like "-fmessage-length=0 -fstack-protector
    -funwind-tables -fasynchronous-unwind-tables -fno-strict-aliasing" from
    the output of "mpicc -show".  We already handle preprocessor definition
    arguments like -DUSE_STDARG.  Honor '-f' flags too.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 45d6bff..9fef8f9 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -188,7 +188,7 @@ if (MPI_INCLUDE_PATH AND MPI_LIBRARY)
   # the cache, and we don't want to override those settings.
 elseif (MPI_COMPILE_CMDLINE)
   # Extract compile flags from the compile command line.
-  string(REGEX MATCHALL "(^| )-D([^\" ]+|\"[^\"]+\")" MPI_ALL_COMPILE_FLAGS "${MPI_COMPILE_CMDLINE}")
+  string(REGEX MATCHALL "(^| )-[Df]([^\" ]+|\"[^\"]+\")" MPI_ALL_COMPILE_FLAGS "${MPI_COMPILE_CMDLINE}")
   set(MPI_COMPILE_FLAGS_WORK)
   foreach(FLAG ${MPI_ALL_COMPILE_FLAGS})
     if (MPI_COMPILE_FLAGS_WORK)

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

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


hooks/post-receive
-- 
CMake