diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-02 12:02:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-02 12:02:24 (GMT) |
| commit | a432b1075c8808c6e4c925d3f4d4ce94c5477bab (patch) | |
| tree | cbf85da9bdbfdd82e2e0fa6d210478840f82b2da /Source/cmGlobalGenerator.cxx | |
| parent | ec7b5f21eef8bc0d6da729aa0f61ddccc7a06f3b (diff) | |
| parent | 7ed8c9ebe33ccafc41ec9e096bf2884d617a0ebf (diff) | |
| download | CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.zip CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.tar.gz CMake-a432b1075c8808c6e4c925d3f4d4ce94c5477bab.tar.bz2 | |
Merge topic 'getdef-expand'
7ed8c9ebe3 cmMakefile: add GetDefExpandList() that splits value into std::vector
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4819
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 68e25fb..4dc4092 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2524,9 +2524,8 @@ void cmGlobalGenerator::AddGlobalTarget_Test( cmCustomCommandLine singleLine; singleLine.push_back(cmSystemTools::GetCTestCommand()); singleLine.push_back("--force-new-ctest-process"); - if (auto testArgs = mf->GetDefinition("CMAKE_CTEST_ARGUMENTS")) { - std::vector<std::string> args; - cmExpandList(testArgs, args); + std::vector<std::string> args; + if (mf->GetDefExpandList("CMAKE_CTEST_ARGUMENTS", args)) { for (auto const& arg : args) { singleLine.push_back(arg); } |