diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 18:50:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-30 18:50:33 (GMT) |
| commit | 4f7f6651830b847de006bf8bdc5cbd4a9e39805f (patch) | |
| tree | bd4134a603445e6493cf4bd8891629a290413008 | |
| parent | 2e8a5ac31f3f95cd01cfde4f86dc78d091b13d7e (diff) | |
| parent | 4671f3ab7dc65186484ce31dff5e810aa2792145 (diff) | |
| download | CMake-4f7f6651830b847de006bf8bdc5cbd4a9e39805f.zip CMake-4f7f6651830b847de006bf8bdc5cbd4a9e39805f.tar.gz CMake-4f7f6651830b847de006bf8bdc5cbd4a9e39805f.tar.bz2 | |
Merge topic 'FindOpenMP-intel-qopenmp'
4671f3ab FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp
| -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 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") |