diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-05-20 22:33:24 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2015-05-20 22:33:24 +0000 |
| commit | 7979a07611f0ce096ae09fac8985f7a1160b8bd2 (patch) | |
| tree | 2e74966761b1c7cb9f8425777c5d28a12abf9f97 /openmp/runtime/cmake/PerlFlags.cmake | |
| parent | 58443f2429be0defc2de33a0f990337dca748224 (diff) | |
| download | bcm5719-llvm-7979a07611f0ce096ae09fac8985f7a1160b8bd2.tar.gz bcm5719-llvm-7979a07611f0ce096ae09fac8985f7a1160b8bd2.zip | |
Change CMake variable prefix to LIBOMP
Cached CMake variables need to have a prefix so they don't collide with other
projects. This change (a lot of simple changes) simply prefixes cached variables
with LIBOMP_ and sets all of these variables to UPPERCASE which is convention.
e.g., os => LIBOMP_OS, ompt_support => LIBOMP_OMPT_SUPPORT.
Differential Revision: http://reviews.llvm.org/D9829
llvm-svn: 237845
Diffstat (limited to 'openmp/runtime/cmake/PerlFlags.cmake')
| -rw-r--r-- | openmp/runtime/cmake/PerlFlags.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/openmp/runtime/cmake/PerlFlags.cmake b/openmp/runtime/cmake/PerlFlags.cmake index 978b72fbc45..4254eeb54ed 100644 --- a/openmp/runtime/cmake/PerlFlags.cmake +++ b/openmp/runtime/cmake/PerlFlags.cmake @@ -26,14 +26,14 @@ include(HelperFunctions) # for set_legal_type(), set_legal_arch() # Perl expand-vars.pl flags function(set_ev_flags input_ev_flags) set(local_ev_flags) - set_legal_type("${lib_type}" legal_type) - set_legal_arch("${arch}" legal_arch) + set_legal_type("${LIBOMP_LIB_TYPE}" legal_type) + set_legal_arch("${LIBOMP_ARCH}" legal_arch) # need -D Revision="\$Revision" to show up append_ev_flags("-D Revision=\"\\\\$$Revision\"") append_ev_flags("-D Date=\"\\\\$$Date\"") append_ev_flags("-D KMP_TYPE=\"${legal_type}\"") append_ev_flags("-D KMP_ARCH=\"${legal_arch}\"") - append_ev_flags("-D KMP_VERSION_MAJOR=${version}") + append_ev_flags("-D KMP_VERSION_MAJOR=${LIBOMP_VERSION}") append_ev_flags("-D KMP_VERSION_MINOR=0") append_ev_flags("-D KMP_VERSION_BUILD=${build_number}") append_ev_flags("-D KMP_BUILD_DATE=\"${date}\"") @@ -45,9 +45,9 @@ function(set_ev_flags input_ev_flags) append_ev_flags("-D KMP_DIAG=0") append_ev_flags("-D KMP_DEBUG_INFO=0") endif() - if(${omp_version} EQUAL 40) + if(${LIBOMP_VERSION} EQUAL 40) append_ev_flags("-D OMP_VERSION=201307") - elseif(${omp_version} EQUAL 30) + elseif(${LIBOMP_VERSION} EQUAL 30) append_ev_flags("-D OMP_VERSION=201107") else() append_ev_flags("-D OMP_VERSION=200505") @@ -62,7 +62,7 @@ function(set_gd_flags input_gd_flags) elseif(${INTEL64}) append_gd_flags("-D arch_32e") else() - append_gd_flags("-D arch_${arch}") + append_gd_flags("-D arch_${LIBOMP_ARCH}") endif() if(${NORMAL_LIBRARY}) append_gd_flags("-D norm") @@ -71,22 +71,22 @@ function(set_gd_flags input_gd_flags) elseif(${STUBS_LIBRARY}) append_gd_flags("-D stub") endif() - if(${omp_version} GREATER 41 OR ${omp_version} EQUAL 41) + if(${LIBOMP_OMP_VERSION} GREATER 41 OR ${LIBOMP_OMP_VERSION} EQUAL 41) append_gd_flags("-D OMP_41") endif() - if(${omp_version} GREATER 40 OR ${omp_version} EQUAL 40) + if(${LIBOMP_OMP_VERSION} GREATER 40 OR ${LIBOMP_OMP_VERSION} EQUAL 40) append_gd_flags("-D OMP_40") endif() - if(${omp_version} GREATER 30 OR ${omp_version} EQUAL 30) + if(${LIBOMP_OMP_VERSION} GREATER 30 OR ${LIBOMP_OMP_VERSION} EQUAL 30) append_gd_flags("-D OMP_30") endif() - if(NOT "${version}" STREQUAL "4") + if(NOT "${LIBOMP_VERSION}" STREQUAL "4") append_gd_flags("-D msvc_compat") endif() if(${DEBUG_BUILD} OR ${RELWITHDEBINFO_BUILD}) append_gd_flags("-D KMP_DEBUG") endif() - if(${COMPILER_SUPPORTS_QUAD_PRECISION}) + if(${LIBOMP_COMPILER_SUPPORTS_QUAD_PRECISION}) append_gd_flags("-D HAVE_QUAD") endif() set(${input_gd_flags} "${local_gd_flags}" PARENT_SCOPE) |

