diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-15 13:49:37 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-15 09:49:46 -0400 |
| commit | 156196938c5e03e881592dd3247021063167abc0 (patch) | |
| tree | 4ff6facbd687820d7f73bd0829f96d8a582360d7 /Source/cmGlobalGenerator.cxx | |
| parent | ad386d42d7bb4c6c13c9b3abf4c06ef98f03dbb5 (diff) | |
| parent | e64fa5f1b611353522ec014192046ab3bf67e69f (diff) | |
| download | cmake-156196938c5e03e881592dd3247021063167abc0.tar.gz | |
Merge topic 'cmprop-source'
e64fa5f1b6 cmSourceFile::GetProperty: return cmProp
fc223f9860 cmGlobalXCodeGenerator: Fix genex interpreter overloads
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4603
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 035c6083e5..8505d43aee 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -3109,10 +3109,10 @@ void cmGlobalGenerator::WriteSummary(cmGeneratorTarget* target) std::string const& sfp = sf->ResolveFullPath(); fout << sfp << "\n"; lj_source["file"] = sfp; - if (const char* svalue = sf->GetProperty("LABELS")) { + if (cmProp svalue = sf->GetProperty("LABELS")) { labels.clear(); Json::Value& lj_source_labels = lj_source["labels"] = Json::arrayValue; - cmExpandList(svalue, labels); + cmExpandList(*svalue, labels); for (std::string const& label : labels) { fout << " " << label << "\n"; lj_source_labels.append(label); |