[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5139-g4bf9884

[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  4bf98844a6ec2ec741d5cf2f5ad4162974bd1e1f (commit)
       via  ebf70b037ddc45941c3ad2152622fd7326517c1e (commit)
      from  741a0912286415e4adb53ca50530f52869ca06e5 (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=4bf98844a6ec2ec741d5cf2f5ad4162974bd1e1f
commit 4bf98844a6ec2ec741d5cf2f5ad4162974bd1e1f
Merge: 741a091 ebf70b0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Nov 13 15:42:45 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 15:42:45 2013 -0500

    Merge topic 'openmp-cray' into next
    
    ebf70b0 FindOpenMP: fix detecting compilers that do not need any special flag (#14567)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebf70b037ddc45941c3ad2152622fd7326517c1e
commit ebf70b037ddc45941c3ad2152622fd7326517c1e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Nov 13 21:41:33 2013 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Nov 13 21:41:33 2013 +0100

    FindOpenMP: fix detecting compilers that do not need any special flag (#14567)

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index f4a9f44..8afad68 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -31,6 +31,8 @@ set(_OPENMP_REQUIRED_VARS)
 
 function(_OPENMP_FLAG_CANDIDATES LANG)
   set(OpenMP_FLAG_CANDIDATES
+    #Empty, if compiler automatically accepts openmp
+    " "
     #GNU
     "-fopenmp"
     #Microsoft Visual Studio
@@ -39,8 +41,6 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     "-Qopenmp"
     #PathScale, Intel
     "-openmp"
-    #Empty, if compiler automatically accepts openmp
-    " "
     #Sun
     "-xopenmp"
     #HP
@@ -64,6 +64,7 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
   set(OMP_FLAG_PGI "-mp")
   set(OMP_FLAG_SunPro "-xopenmp")
   set(OMP_FLAG_XL "-qsmp")
+  set(OMP_FLAG_Cray " ")
 
   # 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
@@ -100,7 +101,7 @@ if(CMAKE_C_COMPILER_LOADED)
     include(${CMAKE_CURRENT_LIST_DIR}/CheckCSourceCompiles.cmake)
   endif()
 
-  foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
+  foreach(FLAG IN LISTS OpenMP_C_FLAG_CANDIDATES)
     set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
     set(CMAKE_REQUIRED_FLAGS "${FLAG}")
     unset(OpenMP_FLAG_DETECTED CACHE)
@@ -134,7 +135,7 @@ if(CMAKE_CXX_COMPILER_LOADED)
     set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE})
   endif()
 
-  foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
+  foreach(FLAG IN LISTS OpenMP_CXX_FLAG_CANDIDATES)
     set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
     set(CMAKE_REQUIRED_FLAGS "${FLAG}")
     unset(OpenMP_FLAG_DETECTED CACHE)

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

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


hooks/post-receive
-- 
CMake