diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-04 14:41:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-04 14:41:38 (GMT) |
| commit | b2726f13bdd2caffcd27dd5c7ebf3211169a40e4 (patch) | |
| tree | 58b045457aa25cb24c55c343d917e371139d3e1e | |
| parent | 6cba07451619ec2eb83217c598961ca63a110d60 (diff) | |
| parent | d6746fd05c92a8edb94de746846227e6101fc05e (diff) | |
| download | CMake-b2726f13bdd2caffcd27dd5c7ebf3211169a40e4.zip CMake-b2726f13bdd2caffcd27dd5c7ebf3211169a40e4.tar.gz CMake-b2726f13bdd2caffcd27dd5c7ebf3211169a40e4.tar.bz2 | |
Merge topic 'e2k_support'
d6746fd05c cmMakefile: Fix compilation on EDG-based compilers such as LCC
77c237d219 zstd: Fix incorrect pragma error on LCC compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Igor S. Gerasimov <i.s.ger@yandex.ru>
Merge-request: !6579
| -rw-r--r-- | Source/cmMakefile.cxx | 9 | ||||
| -rw-r--r-- | Utilities/cmzstd/lib/common/compiler.h | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a490dac..83984f7 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3982,11 +3982,10 @@ cmValue cmMakefile::GetProperty(const std::string& prop) const if (prop == "TESTS") { std::vector<std::string> keys; // get list of keys - std::transform(this->Tests.begin(), this->Tests.end(), - std::back_inserter(keys), - [](decltype(this->Tests)::value_type const& pair) { - return pair.first; - }); + const auto* t = this; + std::transform( + t->Tests.begin(), t->Tests.end(), std::back_inserter(keys), + [](decltype(t->Tests)::value_type const& pair) { return pair.first; }); output = cmJoin(keys, ";"); return cmValue(output); } diff --git a/Utilities/cmzstd/lib/common/compiler.h b/Utilities/cmzstd/lib/common/compiler.h index 95e9483..1b864ea 100644 --- a/Utilities/cmzstd/lib/common/compiler.h +++ b/Utilities/cmzstd/lib/common/compiler.h @@ -139,7 +139,7 @@ /* vectorization * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */ -#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) +#if !defined(__INTEL_COMPILER) && !defined(__clang__) && !defined(__LCC__) && defined(__GNUC__) # if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5) # define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize"))) # else |