diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-30 13:45:00 -0400 |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-30 15:00:14 -0400 |
| commit | 3eec21a01cda630f34a4505d66bdbf6d5063ecdc (patch) | |
| tree | 78481680659c0c29e7dc2cb4cac82bce280ce8a0 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 888b8a43d82e6f6157642c2bd84520920d8e2d11 (diff) | |
| download | cmake-3eec21a01cda630f34a4505d66bdbf6d5063ecdc.tar.gz | |
cmTarget::GetProperty: return cmProp
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index abc8b6f760..96543e527d 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -877,11 +877,10 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReference( void cmVisualStudio10TargetGenerator::WriteImports(Elem& e0) { - const char* imports = + cmProp imports = this->GeneratorTarget->Target->GetProperty("VS_PROJECT_IMPORT"); if (imports) { - std::vector<std::string> argsSplit = - cmExpandedList(std::string(imports), false); + std::vector<std::string> argsSplit = cmExpandedList(*imports, false); for (auto& path : argsSplit) { if (!cmsys::SystemTools::FileIsFullPath(path)) { path = this->Makefile->GetCurrentSourceDirectory() + "/" + path; @@ -1959,11 +1958,12 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1, } if (ParsedToolTargetSettings.find(tool) == ParsedToolTargetSettings.end()) { - const char* toolTargetProperty = - this->GeneratorTarget->Target->GetProperty("VS_SOURCE_SETTINGS_" + - std::string(tool)); + cmProp toolTargetProperty = this->GeneratorTarget->Target->GetProperty( + "VS_SOURCE_SETTINGS_" + std::string(tool)); ConfigToSettings toolTargetSettings; - ParseSettingsProperty(toolTargetProperty, toolTargetSettings); + if (toolTargetProperty) { + ParseSettingsProperty(toolTargetProperty->c_str(), toolTargetSettings); + } ParsedToolTargetSettings[tool] = toolTargetSettings; } |