[Cmake-commits] CMake branch, next, updated. v3.0.0-3964-g5af7447

[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  5af7447ab8cc51e888d3676594c01110beb518c0 (commit)
       via  4671f3ab7dc65186484ce31dff5e810aa2792145 (commit)
      from  9e150f53f1241ea9910b9b0a504825fe657a9d84 (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=5af7447ab8cc51e888d3676594c01110beb518c0
commit 5af7447ab8cc51e888d3676594c01110beb518c0
Merge: 9e150f5 4671f3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 27 09:33:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 27 09:33:35 2014 -0400

    Merge topic 'FindOpenMP-intel-qopenmp' into next
    
    4671f3ab FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4671f3ab7dc65186484ce31dff5e810aa2792145
commit 4671f3ab7dc65186484ce31dff5e810aa2792145
Author:     Adam Strzelecki <ono at java.pl>
AuthorDate: Thu Jun 26 15:29:04 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 27 09:30:51 2014 -0400

    FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp
    
    Intel Composer XE 2015 Beta 2 deprecates all options starting with -o
    for sake of compatibility with other compilers expecting anything goes
    after -o... is output file name.

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 30972ae..935a0ca 100644
--- a/Modules/FindOpenMP.cmake
+++ b/Modules/FindOpenMP.cmake
@@ -68,8 +68,11 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
   set(OMP_FLAG_HP "+Oopenmp")
   if(WIN32)
     set(OMP_FLAG_Intel "-Qopenmp")
-  else()
+  elseif(CMAKE_${LANG}_COMPILER_ID STREQUAL "Intel" AND
+         "${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528")
     set(OMP_FLAG_Intel "-openmp")
+  else()
+    set(OMP_FLAG_Intel "-qopenmp")
   endif()
   set(OMP_FLAG_MIPSpro "-mp")
   set(OMP_FLAG_MSVC "/openmp")

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

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


hooks/post-receive
-- 
CMake