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

stringapi: Use strings for property names

Browse Source 
Property names are always generated by CMake and should never be NULL.
This commit is contained in:
Ben Boeckel
2013-09-02 16:27:32 -04:00
committed by Brad King
parent 2977330a7b
commit ec97ed7d0c
32 changed files with 262 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGetTargetPropertyCommand.cxx
+8 -4
View File
@@ -22,7 +22,7 @@ bool cmGetTargetPropertyCommand
}
std::string var = args[0].c_str();
const std::string& targetName = args[1];
const char *prop = 0;
std::string prop;
if(args[2] == "ALIASED_TARGET")
{
@@ -38,7 +38,11 @@ bool cmGetTargetPropertyCommand
else if(cmTarget* tgt = this->Makefile->FindTargetToUse(targetName))
{
cmTarget& target = *tgt;
prop = target.GetProperty(args[2].c_str());
const char* prop_cstr = target.GetProperty(args[2].c_str());
if(prop_cstr)
{
prop = prop_cstr;
}
}
else
{
@@ -70,9 +74,9 @@ bool cmGetTargetPropertyCommand
}
}
}
if (prop)
if (!prop.empty())
{
this->Makefile->AddDefinition(var.c_str(), prop);
this->Makefile->AddDefinition(var.c_str(), prop.c_str());
return true;
}
this->Makefile->AddDefinition(var.c_str(), (var+"-NOTFOUND").c_str());