diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:19:58 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:19:58 +0900 |
| commit | 484e650e5f7846961a1597af681a9186b2a03729 (patch) | |
| tree | 83cbc84f064eb6ac9691cbfa3ac4d8c6f311fb0b /Source/cmQtAutoGen.cxx | |
| parent | cd3301b98f04fe073d08531f49b84be0aa2897ef (diff) | |
| download | cmake-484e650e5f7846961a1597af681a9186b2a03729.tar.gz cmake-484e650e5f7846961a1597af681a9186b2a03729.tar.bz2 cmake-484e650e5f7846961a1597af681a9186b2a03729.zip | |
Imported Upstream version 3.17.0upstream/3.17.0
Diffstat (limited to 'Source/cmQtAutoGen.cxx')
| -rw-r--r-- | Source/cmQtAutoGen.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index eb7c900c3..d5891c447 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -8,6 +8,8 @@ #include <sstream> #include <utility> +#include <cmext/algorithm> + #include "cmsys/FStream.hxx" #include "cmsys/RegularExpression.hxx" @@ -67,7 +69,7 @@ void MergeOptions(std::vector<std::string>& baseOpts, } } // Append options - cmAppend(baseOpts, extraOpts); + cm::append(baseOpts, extraOpts); } // - Class definitions @@ -328,7 +330,7 @@ bool cmQtAutoGen::RccLister::list(std::string const& qrcFile, { std::vector<std::string> cmd; cmd.emplace_back(this->RccExcutable_); - cmAppend(cmd, this->ListOptions_); + cm::append(cmd, this->ListOptions_); cmd.emplace_back(cmSystemTools::GetFilenameName(qrcFile)); // Log command |