diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-12 13:38:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-12 13:38:37 (GMT) |
| commit | 708b3fecfe4ea4f92f49bb5eea5c9eed370a5956 (patch) | |
| tree | 50c7e6cf706b03cf6364776a3b2d5d920e24164a /Source/cmCommandArgumentParserHelper.cxx | |
| parent | 1c1a1e08e82626aaf53ec0285ff4eabdb75d6d71 (diff) | |
| parent | 13d10ee61642ab384d506fa81a991e51d90c6488 (diff) | |
| download | CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.zip CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.tar.gz CMake-708b3fecfe4ea4f92f49bb5eea5c9eed370a5956.tar.bz2 | |
Merge topic 'gicv-stdstring'
13d10ee616 cmState::GetInitializedCacheValue: Return as const std::string*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2365
Diffstat (limited to 'Source/cmCommandArgumentParserHelper.cxx')
| -rw-r--r-- | Source/cmCommandArgumentParserHelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index 83352bb..2b4ceaa 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -68,12 +68,12 @@ const char* cmCommandArgumentParserHelper::ExpandSpecialVariable( return ""; } if (strcmp(key, "CACHE") == 0) { - if (const char* c = + if (const std::string* c = this->Makefile->GetState()->GetInitializedCacheValue(var)) { if (this->EscapeQuotes) { - return this->AddString(cmSystemTools::EscapeQuotes(c)); + return this->AddString(cmSystemTools::EscapeQuotes(*c)); } - return this->AddString(c); + return this->AddString(*c); } return ""; } |