diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-09 13:46:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-09 13:46:47 (GMT) |
| commit | 7e3250da2fa0155a8c83b3aadef0407a701f2953 (patch) | |
| tree | 1f5b92efaadf60e4cde70dab7ae5b88772247571 /Source/CTest | |
| parent | dc771bf1aff464ce08eed57884413bd6a5186470 (diff) | |
| parent | e5cd39ca80c8c234118ded33a1576c1be281aa9e (diff) | |
| download | CMake-7e3250da2fa0155a8c83b3aadef0407a701f2953.zip CMake-7e3250da2fa0155a8c83b3aadef0407a701f2953.tar.gz CMake-7e3250da2fa0155a8c83b3aadef0407a701f2953.tar.bz2 | |
Merge topic 'cmProp-class'
e5cd39ca80 cmProp: refactoring: transform alias in class
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6420
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestStartCommand.cxx | 8 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmitCommand.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 53e1b2f..a8c2403 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -30,8 +30,8 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args, size_t cnt = 0; const char* smodel = nullptr; - const std::string* src_dir = nullptr; - const std::string* bld_dir = nullptr; + cmProp src_dir; + cmProp bld_dir; while (cnt < args.size()) { if (args[cnt] == "GROUP" || args[cnt] == "TRACK") { @@ -55,10 +55,10 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args, smodel = args[cnt].c_str(); cnt++; } else if (!src_dir) { - src_dir = &args[cnt]; + src_dir = cmProp(args[cnt]); cnt++; } else if (!bld_dir) { - bld_dir = &args[cnt]; + bld_dir = cmProp(args[cnt]); cnt++; } else { this->SetError("Too many arguments"); diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx index bdba0e5..7aeb288 100644 --- a/Source/CTest/cmCTestSubmitCommand.cxx +++ b/Source/CTest/cmCTestSubmitCommand.cxx @@ -36,8 +36,8 @@ std::unique_ptr<cmCommand> cmCTestSubmitCommand::Clone() cmCTestGenericHandler* cmCTestSubmitCommand::InitializeHandler() { - const std::string* submitURL = !this->SubmitURL.empty() - ? &this->SubmitURL + cmProp submitURL = !this->SubmitURL.empty() + ? cmProp(this->SubmitURL) : this->Makefile->GetDefinition("CTEST_SUBMIT_URL"); if (submitURL) { |