mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-21 15:28:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindOpenMP-intel-oneapi-windows' into release-3.29

Browse Source 
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
This commit is contained in:
Brad King
2024-02-26 15:16:55 +00:00
committed by Kitware Robot
parent 9cd34156f4 6c09451ed3
commit db5d798cd8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/configure_windows_intelcompiler_common.cmake
+4
View File
@@ -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
+1 -1
View File
@@ -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)