mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 02:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'e2k_support'

Browse Source 
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
This commit is contained in:
Brad King
2021-10-04 14:41:20 +00:00
committed by Kitware Robot
parent 6cba074516 d6746fd05c
commit b2726f13bd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.cxx
+4 -5
View File
@@ -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);
}