mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmTarget::GetProperty: return cmProp

Browse Source
This commit is contained in:
Vitaly Stakhovsky
2020-03-30 13:45:00 -04:00
parent 888b8a43d8
commit 3eec21a01c
14 changed files with 169 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmVisualStudio10TargetGenerator.cxx
+7 -7
View File
@@ -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;
}