Merge topic 'FindOpenMP-intel-qopenmp'

4671f3ab FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp
This commit is contained in:
Brad King 2014-06-30 14:50:33 -04:00 committed by CMake Topic Stage
commit 4f7f665183
1 changed files with 4 additions and 1 deletions

View File

@ -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")