diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-09 14:03:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-09 14:04:17 (GMT) |
| commit | c673511263822c688fa302120a29e1e0cf812c0b (patch) | |
| tree | 3d1912a590910c551bf566f47ce2bf72916c2611 | |
| parent | 1d73d61664f3ad5b9e280ed5ca29b164c3c17731 (diff) | |
| parent | 3adeb3b4709cadbe869cf7fff9a73709ed51a212 (diff) | |
| download | CMake-c673511263822c688fa302120a29e1e0cf812c0b.zip CMake-c673511263822c688fa302120a29e1e0cf812c0b.tar.gz CMake-c673511263822c688fa302120a29e1e0cf812c0b.tar.bz2 | |
Merge topic 'FindOpenMP-clang-windows' into release-3.29
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
| -rw-r--r-- | .gitlab/ci/configure_windows_clang_common.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindOpenMP.cmake | 3 |
2 files changed, 6 insertions, 1 deletions
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) 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) |