[Cmake-commits] CMake branch, next, updated. v2.8.7-2705-g1c74338

[Rolf Eike Beer]

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  1c743388e414a33f73482e4e39861f13fe42a40d (commit)
       via  b4b349714739efc46de44fd9471cb36bdb4224f2 (commit)
      from  c984ff2728288c7a5f38aa323110f5e1845b91fe (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=1c743388e414a33f73482e4e39861f13fe42a40d
commit 1c743388e414a33f73482e4e39861f13fe42a40d
Merge: c984ff2 b4b3497
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 18 10:52:32 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 18 10:52:32 2012 -0500

    Merge topic 'improve-findopenmp' into next
    
    b4b3497 FindOpenMP: add a default flag for PathScale compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4b349714739efc46de44fd9471cb36bdb4224f2
commit b4b349714739efc46de44fd9471cb36bdb4224f2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Feb 18 16:52:22 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Feb 18 16:52:22 2012 +0100

    FindOpenMP: add a default flag for PathScale compiler

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index ed5ef8f..e1af15e 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -40,7 +40,7 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     "/openmp"
     #Intel windows
     "-Qopenmp"
-    #Intel
+    #PathScale, Intel
     "-openmp"
     #Empty, if compiler automatically accepts openmp
     " "
@@ -50,22 +50,23 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     "+Oopenmp"
     #IBM XL C/c++
     "-qsmp"
-    #Portland Group
+    #Portland Group, MIPSpro
     "-mp"
   )
 
   set(OMP_FLAG_GNU "-fopenmp")
-  set(OMP_FLAG_MSVC "/openmp")
+  set(OMP_FLAG_HP "+Oopenmp")
   if(WIN32)
     set(OMP_FLAG_Intel "-Qopenmp")
   else()
     set(OMP_FLAG_Intel "-openmp")
   endif()
-  set(OMP_FLAG_SunPro "-xopenmp")
-  set(OMP_FLAG_HP "+Oopenmp")
-  set(OMP_FLAG_XL "-qsmp")
   set(OMP_FLAG_MIPSpro "-mp")
+  set(OMP_FLAG_MSVC "/openmp")
+  set(OMP_FLAG_PathScale "-openmp")
   set(OMP_FLAG_PGI "-mp")
+  set(OMP_FLAG_SunPro "-xopenmp")
+  set(OMP_FLAG_XL "-qsmp")
 
   # Move the flag that matches the compiler to the head of the list,
   # this is faster and doesn't clutter the output that much. If that

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

Summary of changes:
 Modules/FindOpenMP.cmake |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake