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/CTest/cmCTestSubmitHandler.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/CTest/cmCTestSubmitHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index f97d7eb..414a20d 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -156,7 +156,7 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( ::curl_global_init(CURL_GLOBAL_ALL); std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions")); std::vector<std::string> args; - cmSystemTools::ExpandListArgument(curlopt, args); + cmExpandList(curlopt, args); bool verifyPeerOff = false; bool verifyHostOff = false; for (std::string const& arg : args) { @@ -500,7 +500,7 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file, curl.SetQuiet(this->Quiet); std::string curlopt(this->CTest->GetCTestConfiguration("CurlOptions")); std::vector<std::string> args; - cmSystemTools::ExpandListArgument(curlopt, args); + cmExpandList(curlopt, args); curl.SetCurlOptions(args); curl.SetTimeOutSeconds(SUBMIT_TIMEOUT_IN_SECONDS_DEFAULT); curl.SetHttpHeaders(this->HttpHeaders); |