mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-03 05:08:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindOpenMP-clang-windows'

Browse Source 
3adeb3b470 ci: Enable FindOpenMP tests in LLVM/Clang nightly CI jobs on Windows
3019af64c2 FindOpenMP: Add support for GNU-like Clang targeting MSVC ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9235
This commit is contained in:
Brad King
2024-02-09 14:03:57 +00:00
committed by Kitware Robot
parent c91c482db0 3adeb3b470
commit cbac60f98d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/configure_windows_clang_common.cmake
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 "OFF" CACHE BOOL "")
set(CMake_TEST_Java OFF CACHE BOOL "")
set(configure_no_sccache 1)

3
Modules/FindOpenMP.cmake
View File

@@ -224,7 +224,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
)
if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG})
if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} AND
NOT "x${CMAKE_${LANG}_SIMULATE_ID}" STREQUAL "xMSVC")
set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE)
if(CMAKE_${LANG}_VERBOSE_FLAG)