diff options
author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2016-06-14 17:57:47 +0000 |
---|---|---|
committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2016-06-14 17:57:47 +0000 |
commit | df6818bea4f513a5c7adcd203905163d4052cb1b (patch) | |
tree | 1ffd91ed18aefc61971077c9bb125017dbd36347 /openmp/runtime/cmake | |
parent | 2a86b555e14ffd401bdd4d3bba46b89468cf8018 (diff) | |
download | bcm5719-llvm-df6818bea4f513a5c7adcd203905163d4052cb1b.tar.gz bcm5719-llvm-df6818bea4f513a5c7adcd203905163d4052cb1b.zip |
Renaming change: 41 -> 45 and 4.1 -> 4.5
OpenMP 4.1 is now OpenMP 4.5. Any mention of 41 or 4.1 is replaced with
45 or 4.5. Also, if the CMake option LIBOMP_OMP_VERSION is 41, CMake warns that
41 is deprecated and to use 45 instead.
llvm-svn: 272687
Diffstat (limited to 'openmp/runtime/cmake')
-rw-r--r-- | openmp/runtime/cmake/LibompExports.cmake | 2 | ||||
-rw-r--r-- | openmp/runtime/cmake/LibompHandleFlags.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openmp/runtime/cmake/LibompExports.cmake b/openmp/runtime/cmake/LibompExports.cmake index 16fcb20ca71..fd0397e1a91 100644 --- a/openmp/runtime/cmake/LibompExports.cmake +++ b/openmp/runtime/cmake/LibompExports.cmake @@ -21,7 +21,7 @@ set(libomp_suffix) libomp_append(libomp_suffix .deb DEBUG_BUILD) libomp_append(libomp_suffix .dia RELWITHDEBINFO_BUILD) libomp_append(libomp_suffix .min MINSIZEREL_BUILD) -if(NOT "${LIBOMP_OMP_VERSION}" STREQUAL "41") +if(NOT "${LIBOMP_OMP_VERSION}" STREQUAL "45") libomp_append(libomp_suffix .${LIBOMP_OMP_VERSION}) endif() libomp_append(libomp_suffix .s1 LIBOMP_STATS) diff --git a/openmp/runtime/cmake/LibompHandleFlags.cmake b/openmp/runtime/cmake/LibompHandleFlags.cmake index 8fb524fdb29..5a7386074bc 100644 --- a/openmp/runtime/cmake/LibompHandleFlags.cmake +++ b/openmp/runtime/cmake/LibompHandleFlags.cmake @@ -191,8 +191,8 @@ function(libomp_get_gdflags gdflags) libomp_append(gdflags_local "-D stub" STUBS_LIBRARY) libomp_append(gdflags_local "-D HAVE_QUAD" LIBOMP_USE_QUAD_PRECISION) libomp_append(gdflags_local "-D USE_DEBUGGER" LIBOMP_USE_DEBUGGER) - if(${LIBOMP_OMP_VERSION} GREATER 41 OR ${LIBOMP_OMP_VERSION} EQUAL 41) - libomp_append(gdflags_local "-D OMP_41") + if(${LIBOMP_OMP_VERSION} GREATER 45 OR ${LIBOMP_OMP_VERSION} EQUAL 45) + libomp_append(gdflags_local "-D OMP_45") endif() if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40) libomp_append(gdflags_local "-D OMP_40") |