diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2013-09-02 20:27:32 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:28 (GMT) |
commit | ec97ed7d0c67b635caf3ada65541b2eaf0818a93 (patch) | |
tree | 9b38ed2ca59f7da24dfc0db503d9e203ed265fb4 /Source/cmGetTargetPropertyCommand.cxx | |
parent | 2977330a7b27d21e2b6276d9386624b6811b9274 (diff) | |
download | CMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.zip CMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.tar.gz CMake-ec97ed7d0c67b635caf3ada65541b2eaf0818a93.tar.bz2 |
stringapi: Use strings for property names
Property names are always generated by CMake and should never be NULL.
Diffstat (limited to 'Source/cmGetTargetPropertyCommand.cxx')
-rw-r--r-- | Source/cmGetTargetPropertyCommand.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/cmGetTargetPropertyCommand.cxx b/Source/cmGetTargetPropertyCommand.cxx index 4aa49fe..b64f847 100644 --- a/Source/cmGetTargetPropertyCommand.cxx +++ b/Source/cmGetTargetPropertyCommand.cxx @@ -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()); |