diff options
author | Brad King <brad.king@kitware.com> | 2021-03-17 13:15:09 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-17 13:15:54 (GMT) |
commit | 75aa444fd8c6ccfa441723e6274a2421b3c9f739 (patch) | |
tree | 5158dc2de178dacb5a7dabb0c622a502ffc18901 /Modules | |
parent | 68497e8b8cdab7b0b5e9e4e59ffa8ae426e7aea7 (diff) | |
parent | 6fd014a4b6708415b5ca26809b661320c4797835 (diff) | |
download | CMake-75aa444fd8c6ccfa441723e6274a2421b3c9f739.zip CMake-75aa444fd8c6ccfa441723e6274a2421b3c9f739.tar.gz CMake-75aa444fd8c6ccfa441723e6274a2421b3c9f739.tar.bz2 |
Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20
6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5904
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FindOpenMP.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index a1ffc25..52330a4 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -113,7 +113,12 @@ function(_OPENMP_FLAG_CANDIDATES LANG) else() set(OMP_FLAG_Intel "-qopenmp") endif() - set(OMP_FLAG_IntelLLVM "-fiopenmp") + if(CMAKE_${LANG}_COMPILER_ID STREQUAL "IntelLLVM" AND + "x${CMAKE_${LANG}_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC") + set(OMP_FLAG_IntelLLVM "-Qiopenmp") + else() + set(OMP_FLAG_IntelLLVM "-fiopenmp") + endif() set(OMP_FLAG_MSVC "-openmp") set(OMP_FLAG_PathScale "-openmp") set(OMP_FLAG_NAG "-openmp") |