diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-17 13:31:21 (GMT) |
| commit | 6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch) | |
| tree | 1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/cmSetTargetPropertiesCommand.cxx | |
| parent | c903b5319bfcf383964c625bb84d7bc958aba2e9 (diff) | |
| parent | 6313be44aa465ea883e3578b3a0424ae0c217d5c (diff) | |
| download | CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.zip CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz CMake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.bz2 | |
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/cmSetTargetPropertiesCommand.cxx')
| -rw-r--r-- | Source/cmSetTargetPropertiesCommand.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx index dab4180..bf3519c 100644 --- a/Source/cmSetTargetPropertiesCommand.cxx +++ b/Source/cmSetTargetPropertiesCommand.cxx @@ -78,12 +78,12 @@ bool cmSetTargetPropertiesCommand return false; } bool ret = cmSetTargetPropertiesCommand::SetOneTarget - (args[i].c_str(),propertyPairs,this->Makefile); + (args[i],propertyPairs,this->Makefile); if (!ret) { std::string message = "Can not find target to add properties to: "; message += args[i]; - this->SetError(message.c_str()); + this->SetError(message); return false; } } @@ -91,7 +91,7 @@ bool cmSetTargetPropertiesCommand } bool cmSetTargetPropertiesCommand -::SetOneTarget(const char *tname, +::SetOneTarget(const std::string& tname, std::vector<std::string> &propertyPairs, cmMakefile *mf) { @@ -101,9 +101,9 @@ bool cmSetTargetPropertiesCommand unsigned int k; for (k = 0; k < propertyPairs.size(); k = k + 2) { - target->SetProperty(propertyPairs[k].c_str(), + target->SetProperty(propertyPairs[k], propertyPairs[k+1].c_str()); - target->CheckProperty(propertyPairs[k].c_str(), mf); + target->CheckProperty(propertyPairs[k], mf); } } // if file is not already in the makefile, then add it |