diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2023-06-20 14:32:27 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2023-06-22 13:44:17 (GMT) |
| commit | 45f17e5a8566fcdec0071a5ed1bc2656968bf258 (patch) | |
| tree | d7391fbaa4ab69666ced6dd940892c5c401bcfca /Source/cmMakefile.cxx | |
| parent | 88e7ad0084bd6a2fa6f032d7be1ee5d993440dcf (diff) | |
| download | CMake-45f17e5a8566fcdec0071a5ed1bc2656968bf258.zip CMake-45f17e5a8566fcdec0071a5ed1bc2656968bf258.tar.gz CMake-45f17e5a8566fcdec0071a5ed1bc2656968bf258.tar.bz2 | |
cmList: Add container conversion to string
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c3c8d46..5890819 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1980,7 +1980,7 @@ void cmMakefile::AddIncludeDirectories(const std::vector<std::string>& incs, return; } - std::string entryString = cmJoin(incs, ";"); + std::string entryString = cmList::to_string(incs); if (before) { this->StateSnapshot.GetDirectory().PrependIncludeDirectoriesEntry( BT<std::string>(entryString, this->Backtrace)); @@ -3004,12 +3004,11 @@ cm::optional<std::string> cmMakefile::DeferGetCallIds() const { cm::optional<std::string> ids; if (this->Defer) { - ids = cmJoin( + ids = cmList::to_string( cmMakeRange(this->Defer->Commands) .filter([](DeferCommand const& dc) -> bool { return !dc.Id.empty(); }) .transform( - [](DeferCommand const& dc) -> std::string const& { return dc.Id; }), - ";"); + [](DeferCommand const& dc) -> std::string const& { return dc.Id; })); } return ids; } @@ -4160,7 +4159,7 @@ cmValue cmMakefile::GetProperty(const std::string& prop) const 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, ";"); + output = cmList::to_string(keys); return cmValue(output); } |