diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-09-14 16:01:23 (GMT) |
|---|---|---|
| committer | Christian Pfeiffer <cpfeiffer@live.de> | 2017-09-14 16:02:50 (GMT) |
| commit | 23530151b225732ed2999f07fcbb91878bfa3154 (patch) | |
| tree | 2c9bb743368b937f6bce25a527ae7fa58d2bc944 /Modules/FindOpenMP.cmake | |
| parent | a763cffd6b65bbe5572527e39969981bf31d5aca (diff) | |
| download | CMake-23530151b225732ed2999f07fcbb91878bfa3154.zip CMake-23530151b225732ed2999f07fcbb91878bfa3154.tar.gz CMake-23530151b225732ed2999f07fcbb91878bfa3154.tar.bz2 | |
FindOpenMP: Minor environmental improvements
A backup flag for Cray compilers was added and the OpenMP 5.0 Preview 1
document was added to the specification map.
Diffstat (limited to 'Modules/FindOpenMP.cmake')
| -rw-r--r-- | Modules/FindOpenMP.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindOpenMP.cmake b/Modules/FindOpenMP.cmake index 8e9ce7a..4532e61 100644 --- a/Modules/FindOpenMP.cmake +++ b/Modules/FindOpenMP.cmake @@ -98,8 +98,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG) set(OMP_FLAG_Flang "-fopenmp") set(OMP_FLAG_SunPro "-xopenmp") set(OMP_FLAG_XL "-qsmp=omp") - # Cray compiles with OpenMP automatically - set(OMP_FLAG_Cray " ") + # Cray compiler activate OpenMP with -h omp, which is enabled by default. + set(OMP_FLAG_Cray " " "-h omp") # If we know the correct flags, use those if(DEFINED OMP_FLAG_${CMAKE_${LANG}_COMPILER_ID}) @@ -286,6 +286,8 @@ endfunction() macro(_OPENMP_SET_VERSION_BY_SPEC_DATE LANG) set(OpenMP_SPEC_DATE_MAP + # Preview versions + "201611=5.0" # OpenMP 5.0 preview 1 # Combined versions, 2.5 onwards "201511=4.5" "201307=4.0" |