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/cmQtAutoMocUic.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/cmQtAutoMocUic.cxx')
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 6f3b2c6..2cbf113 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -1511,7 +1511,7 @@ bool cmQtAutoMocUic::Init(cmMakefile* makefile) }; auto InfoGetList = [makefile](const char* key) -> std::vector<std::string> { std::vector<std::string> list; - cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition(key), list); + cmExpandList(makefile->GetSafeDefinition(key), list); return list; }; auto InfoGetLists = @@ -1528,8 +1528,7 @@ bool cmQtAutoMocUic::Init(cmMakefile* makefile) if (length >= 2) { std::string::const_iterator itBeg = value.begin() + (pos + 1); std::string::const_iterator itEnd = itBeg + (length - 2); - lists.emplace_back( - cmSystemTools::ExpandedListArgument(std::string(itBeg, itEnd))); + lists.emplace_back(cmExpandedList(std::string(itBeg, itEnd))); } pos += length; pos += ListSep.size(); @@ -1551,7 +1550,7 @@ bool cmQtAutoMocUic::Init(cmMakefile* makefile) auto InfoGetConfigList = [&InfoGetConfig](const char* key) -> std::vector<std::string> { std::vector<std::string> list; - cmSystemTools::ExpandListArgument(InfoGetConfig(key), list); + cmExpandList(InfoGetConfig(key), list); return list; }; auto LogInfoError = [this](std::string const& msg) -> bool { |