diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-29 13:14:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-29 13:15:09 (GMT) |
| commit | 0f9d7dc3ba2f6a82d6d0d54e7cc79899576981b8 (patch) | |
| tree | 919236477d35b3ad908a30ceb044e1cf37f18ebb /Modules | |
| parent | 7c39a9c6b6e2463b9fefc7516faeb48c2cbbd997 (diff) | |
| parent | 26f2b65fec383bbab74f30c4b0bc6649d0b5b509 (diff) | |
| download | CMake-0f9d7dc3ba2f6a82d6d0d54e7cc79899576981b8.zip CMake-0f9d7dc3ba2f6a82d6d0d54e7cc79899576981b8.tar.gz CMake-0f9d7dc3ba2f6a82d6d0d54e7cc79899576981b8.tar.bz2 | |
Merge topic 'findopenmp-new-dates'
26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3375
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenMP.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index b909db8..def23bb 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -347,6 +347,7 @@ macro(_OPENMP_SET_VERSION_BY_SPEC_DATE LANG) # Preview versions "201611=5.0" # OpenMP 5.0 preview 1 # Combined versions, 2.5 onwards + "201811=5.0" "201511=4.5" "201307=4.0" "201107=3.1" @@ -363,6 +364,9 @@ macro(_OPENMP_SET_VERSION_BY_SPEC_DATE LANG) # Fortran version 1.0 "199710=1.0" ) + if(MSVC) + list(APPEND OpenMP_SPEC_DATE_MAP "2019=2.0") + endif() if(OpenMP_${LANG}_SPEC_DATE) string(REGEX MATCHALL "${OpenMP_${LANG}_SPEC_DATE}=([0-9]+)\\.([0-9]+)" _version_match "${OpenMP_SPEC_DATE_MAP}") |