diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-08-09 18:50:17 (GMT) |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-08-09 18:50:17 (GMT) |
commit | c530e2f74ff466b43651372d56bae543eec1a9f1 (patch) | |
tree | 6f3762cfef1f404bc8c9ee5b6efa1a865e970591 /Source/cmServerProtocol.cxx | |
parent | ad4452d1bdabcdf039f812f2b709a905d76e8da0 (diff) | |
download | CMake-c530e2f74ff466b43651372d56bae543eec1a9f1.zip CMake-c530e2f74ff466b43651372d56bae543eec1a9f1.tar.gz CMake-c530e2f74ff466b43651372d56bae543eec1a9f1.tar.bz2 |
cmCompiledGeneratorExpression::Evaluate(): return const std::string&
Diffstat (limited to 'Source/cmServerProtocol.cxx')
-rw-r--r-- | Source/cmServerProtocol.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index c267160..f0a5e26 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -797,9 +797,8 @@ static Json::Value DumpCTestInfo(cmLocalGenerator* lg, cmTest* testInfo, // Remove any config specific variables from the output. cmGeneratorExpression ge; - auto cge = ge.Parse(command.c_str()); - const char* processed = cge->Evaluate(lg, config); - + auto cge = ge.Parse(command); + const std::string& processed = cge->Evaluate(lg, config); result[kCTEST_COMMAND] = processed; // Build up the list of properties that may have been specified @@ -810,7 +809,7 @@ static Json::Value DumpCTestInfo(cmLocalGenerator* lg, cmTest* testInfo, // Remove config variables from the value too. auto cge_value = ge.Parse(prop.second.GetValue()); - const char* processed_value = cge_value->Evaluate(lg, config); + const std::string& processed_value = cge_value->Evaluate(lg, config); entry[kVALUE_KEY] = processed_value; properties.append(entry); } |