From 4671f3ab7dc65186484ce31dff5e810aa2792145 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Thu, 26 Jun 2014 15:29:04 +0200 Subject: 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. --- Modules/FindOpenMP.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Modules/FindOpenMP.cmake') diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index 30972ae0c9..935a0cadc5 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") -- cgit v1.2.1