From 3019af64c2379d318b8498b1eedd1a3cbf32cdb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Thu, 8 Feb 2024 17:54:20 +0100 Subject: FindOpenMP: Add support for GNU-like Clang targeting MSVC ABI Use the code path from commit ceb5ee4a7b (FindOpenMP: Add support for Clang on Windows, 2020-02-05, v3.17.0-rc1~10^2) with the GNU-like frontend too. --- Modules/FindOpenMP.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index 69099f7..f26b864 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -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) -- cgit v0.12 From 3adeb3b4709cadbe869cf7fff9a73709ed51a212 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 8 Feb 2024 17:27:15 -0500 Subject: ci: Enable FindOpenMP tests in LLVM/Clang nightly CI jobs on Windows --- .gitlab/ci/configure_windows_clang_common.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab/ci/configure_windows_clang_common.cmake b/.gitlab/ci/configure_windows_clang_common.cmake index 55dce1d..3d93aae 100644 --- a/.gitlab/ci/configure_windows_clang_common.cmake +++ b/.gitlab/ci/configure_windows_clang_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 "OFF" CACHE BOOL "") set(CMake_TEST_Java OFF CACHE BOOL "") set(configure_no_sccache 1) -- cgit v0.12