diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-18 15:17:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-18 15:18:00 (GMT) |
| commit | a8f628c0a456f74680bfdad0050f2614dbe50853 (patch) | |
| tree | f072a8939837a3d6f954993fdbb9b54e43cdf1f0 /Source/CTest | |
| parent | 7adf3aabd55dd80784727a229a37c394740db628 (diff) | |
| parent | f4ff60a803170311f49511a60a381eef8b78c5dd (diff) | |
| download | CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.zip CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.tar.gz CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.tar.bz2 | |
Merge topic 'getsafedef-stdstring'
f4ff60a803 cmMakefile: Make GetSafeDefinition return std::string const&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2350
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestHandlerCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 8863dc8..667a8ba 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -151,9 +151,9 @@ bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args, cmSystemTools::CollapseFullPath(this->Values[ct_BUILD]).c_str(), this->Quiet); } else { - const char* bdir = + std::string const& bdir = this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY"); - if (bdir) { + if (!bdir.empty()) { this->CTest->SetCTestConfiguration( "BuildDirectory", cmSystemTools::CollapseFullPath(bdir).c_str(), this->Quiet); |