commit 7ff3099e841a263de6de5612e26a4002f29b7861
author Brad King <brad.king@kitware.com> Mon Feb 26 15:16:55 2024 +0000
committer Kitware Robot <kwrobot@kitware.com> Mon Feb 26 10:17:15 2024 -0500
tree ad3a8aebf52f622da409fa1923bfe03ec772cb40
parent 7a7c9f529587b7bd84ff56f57026aa55577ecb01
parent 6c09451ed3957e8b71e55e52f9a4325d309e85bb

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

.gitlab/ci/configure_windows_intelcompiler_common.cmake

diff --git a/.gitlab/ci/configure_windows_intelcompiler_common.cmake b/.gitlab/ci/configure_windows_intelcompiler_common.cmake
index 55dce1d..0777eaf 100644
--- a/.gitlab/ci/configure_windows_intelcompiler_common.cmake
+++ b/.gitlab/ci/configure_windows_intelcompiler_common.cmake
@@ -1,3 +1,7 @@
+set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "")
+set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "")
 set(CMake_TEST_Java OFF CACHE BOOL "")
 
 set(configure_no_sccache 1)

Modules/FindOpenMP.cmake

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