diff options
| author | Adam Strzelecki <ono@java.pl> | 2014-06-26 15:29:04 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-27 09:30:51 -0400 |
| commit | 4671f3ab7dc65186484ce31dff5e810aa2792145 (patch) | |
| tree | 511b7d635a740a0f6b3a76e4d0a2c73657c57e20 /Modules/FindOpenMP.cmake | |
| parent | 1f36b035041972d57947db22adbe6d326c5bc898 (diff) | |
| download | cmake-4671f3ab7dc65186484ce31dff5e810aa2792145.tar.gz | |
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.
Diffstat (limited to 'Modules/FindOpenMP.cmake')
| -rw-r--r-- | Modules/FindOpenMP.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
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") |