[cmake-developers] [PATCH] FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp

[Adam Strzelecki]

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.
---
 Modules/FindOpenMP.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake
index 30972ae..ef449ea 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} EQUAL "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")
-- 
1.9.3 (Apple Git-50)