diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-26 15:16:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-26 15:17:15 (GMT) |
| commit | 7ff3099e841a263de6de5612e26a4002f29b7861 (patch) | |
| tree | ad3a8aebf52f622da409fa1923bfe03ec772cb40 /Modules | |
| parent | 7a7c9f529587b7bd84ff56f57026aa55577ecb01 (diff) | |
| parent | 6c09451ed3957e8b71e55e52f9a4325d309e85bb (diff) | |
| download | CMake-7ff3099e841a263de6de5612e26a4002f29b7861.zip CMake-7ff3099e841a263de6de5612e26a4002f29b7861.tar.gz CMake-7ff3099e841a263de6de5612e26a4002f29b7861.tar.bz2 | |
Merge topic 'FindOpenMP-intel-oneapi-windows'
6c09451ed3 ci: Enable FindOpenMP tests in Intel nightly CI jobs on Windows
d427bfae61 FindOpenMP: Restore support for Intel compilers on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9284
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenMP.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index f26b864..1d36b9b 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -225,7 +225,7 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR) ) if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} AND - NOT "x${CMAKE_${LANG}_SIMULATE_ID}" STREQUAL "xMSVC") + NOT "${CMAKE_${LANG}_COMPILER_ID};${CMAKE_${LANG}_SIMULATE_ID}" STREQUAL "Clang;MSVC") set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE) if(CMAKE_${LANG}_VERBOSE_FLAG) |