diff options
author | Alex Neundorf <neundorf@kde.org> | 2012-05-13 13:34:30 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2012-05-13 15:38:31 (GMT) |
commit | b6fba35411053e334072a1203493140c67f3d30a (patch) | |
tree | d7364041ec7a8a08c9c2e11ad6a9510a113bbb17 /Source/cmInstallProgramsCommand.cxx | |
parent | c7dab4b93668e44ce07b810a08f171f8eb847785 (diff) | |
download | CMake-b6fba35411053e334072a1203493140c67f3d30a.zip CMake-b6fba35411053e334072a1203493140c67f3d30a.tar.gz CMake-b6fba35411053e334072a1203493140c67f3d30a.tar.bz2 |
-strip trailing whitespace
Alex
Diffstat (limited to 'Source/cmInstallProgramsCommand.cxx')
-rw-r--r-- | Source/cmInstallProgramsCommand.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index 7e6c9ce..61ac741 100644 --- a/Source/cmInstallProgramsCommand.cxx +++ b/Source/cmInstallProgramsCommand.cxx @@ -31,26 +31,26 @@ bool cmInstallProgramsCommand for (++s;s != args.end(); ++s) { this->FinalArgs.push_back(*s); - } - + } + this->Makefile->GetLocalGenerator()->GetGlobalGenerator() ->AddInstallComponent("Unspecified"); return true; } -void cmInstallProgramsCommand::FinalPass() +void cmInstallProgramsCommand::FinalPass() { bool files_mode = false; if(!this->FinalArgs.empty() && this->FinalArgs[0] == "FILES") { files_mode = true; } - + // two different options if (this->FinalArgs.size() > 1 || files_mode) { - // for each argument, get the programs + // for each argument, get the programs std::vector<std::string>::iterator s = this->FinalArgs.begin(); if(files_mode) { @@ -68,9 +68,9 @@ void cmInstallProgramsCommand::FinalPass() std::vector<std::string> programs; cmSystemTools::Glob(this->Makefile->GetCurrentDirectory(), this->FinalArgs[0].c_str(), programs); - + std::vector<std::string>::iterator s = programs.begin(); - // for each argument, get the programs + // for each argument, get the programs for (;s != programs.end(); ++s) { this->Files.push_back(this->FindInstallSource(s->c_str())); @@ -112,7 +112,7 @@ std::string cmInstallProgramsCommand // This is a full path. return name; } - + // This is a relative path. std::string tb = this->Makefile->GetCurrentOutputDirectory(); tb += "/"; @@ -120,7 +120,7 @@ std::string cmInstallProgramsCommand std::string ts = this->Makefile->GetCurrentDirectory(); ts += "/"; ts += name; - + if(cmSystemTools::FileExists(tb.c_str())) { // The file exists in the binary tree. Use it. |