diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-08-16 18:50:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-16 18:51:03 (GMT) |
| commit | 2beed5a4ef66f415f4efa327a8c479395d262e52 (patch) | |
| tree | 48b1a8ad1a2fe87cb6a84de2b96379ebd7f78674 /Source/cmQtAutoGenInitializer.cxx | |
| parent | dcf2beb7dec757b7e28eba43fb7f2d5498bded39 (diff) | |
| parent | 2f6495e24e57cd4a03f38e615cc60177e89afb96 (diff) | |
| download | CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.zip CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.gz CMake-2beed5a4ef66f415f4efa327a8c479395d262e52.tar.bz2 | |
Merge topic 'cmExpandList'
2f6495e24e cmSystemTools: Remove ExpandListArgument methods
f4f3c68926 Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument
ff42dec891 cmStringAlgorithms: Add cmExpandList functions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3682
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index d6bef6b..3218076 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -392,7 +392,7 @@ bool cmQtAutoGenInitializer::InitCustomTargets() this->Target->GetSafeProperty("AUTOGEN_TARGET_DEPENDS"); if (!deps.empty()) { std::vector<std::string> extraDeps; - cmSystemTools::ExpandListArgument(deps, extraDeps); + cmExpandList(deps, extraDeps); for (std::string const& depName : extraDeps) { // Allow target and file dependencies auto* depTarget = makefile->FindTargetToUse(depName); @@ -543,7 +543,7 @@ bool cmQtAutoGenInitializer::InitUic() std::string const usp = this->Target->GetSafeProperty("AUTOUIC_SEARCH_PATHS"); if (!usp.empty()) { - cmSystemTools::ExpandListArgument(usp, this->Uic.SearchPaths); + cmExpandList(usp, this->Uic.SearchPaths); std::string const& srcDir = makefile->GetCurrentSourceDirectory(); for (std::string& path : this->Uic.SearchPaths) { path = cmSystemTools::CollapseFullPath(path, srcDir); @@ -689,7 +689,7 @@ bool cmQtAutoGenInitializer::InitScanFiles() { std::string const opts = sf->GetSafeProperty(kw.AUTORCC_OPTIONS); if (!opts.empty()) { - cmSystemTools::ExpandListArgument(opts, qrc.Options); + cmExpandList(opts, qrc.Options); } } this->Rcc.Qrcs.push_back(std::move(qrc)); @@ -808,7 +808,7 @@ bool cmQtAutoGenInitializer::InitScanFiles() if (!uicOpts.empty()) { this->Uic.FileFiles.push_back(std::move(realPath)); std::vector<std::string> optsVec; - cmSystemTools::ExpandListArgument(uicOpts, optsVec); + cmExpandList(uicOpts, optsVec); this->Uic.FileOptions.push_back(std::move(optsVec)); } } else { @@ -862,8 +862,8 @@ bool cmQtAutoGenInitializer::InitScanFiles() const bool modernQt = (this->QtVersion.Major >= 5); // Target rcc options std::vector<std::string> optionsTarget; - cmSystemTools::ExpandListArgument( - this->Target->GetSafeProperty(kw.AUTORCC_OPTIONS), optionsTarget); + cmExpandList(this->Target->GetSafeProperty(kw.AUTORCC_OPTIONS), + optionsTarget); // Check if file name is unique for (Qrc& qrc : this->Rcc.Qrcs) { |