summaryrefslogtreecommitdiff
path: root/Source/cmSubdirCommand.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmSubdirCommand.cxx')
-rw-r--r--Source/cmSubdirCommand.cxx57
1 files changed, 23 insertions, 34 deletions
diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx
index 6a4a835511..401f588c44 100644
--- a/Source/cmSubdirCommand.cxx
+++ b/Source/cmSubdirCommand.cxx
@@ -12,62 +12,51 @@
#include "cmSubdirCommand.h"
// cmSubdirCommand
-bool cmSubdirCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
+bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus&)
{
- if(args.size() < 1 )
- {
+ if (args.size() < 1) {
this->SetError("called with incorrect number of arguments");
return false;
- }
+ }
bool res = true;
bool excludeFromAll = false;
- for(std::vector<std::string>::const_iterator i = args.begin();
- i != args.end(); ++i)
- {
- if(*i == "EXCLUDE_FROM_ALL")
- {
+ for (std::vector<std::string>::const_iterator i = args.begin();
+ i != args.end(); ++i) {
+ if (*i == "EXCLUDE_FROM_ALL") {
excludeFromAll = true;
continue;
- }
- if(*i == "PREORDER")
- {
+ }
+ if (*i == "PREORDER") {
// Ignored
continue;
- }
+ }
// if they specified a relative path then compute the full
std::string srcPath =
- std::string(this->Makefile->GetCurrentSourceDirectory()) +
- "/" + i->c_str();
- if (cmSystemTools::FileIsDirectory(srcPath))
- {
+ std::string(this->Makefile->GetCurrentSourceDirectory()) + "/" +
+ i->c_str();
+ if (cmSystemTools::FileIsDirectory(srcPath)) {
std::string binPath =
- std::string(this->Makefile->GetCurrentBinaryDirectory()) +
- "/" + i->c_str();
- this->Makefile->AddSubDirectory(srcPath, binPath,
- excludeFromAll, false);
- }
+ std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" +
+ i->c_str();
+ this->Makefile->AddSubDirectory(srcPath, binPath, excludeFromAll, false);
+ }
// otherwise it is a full path
- else if ( cmSystemTools::FileIsDirectory(*i) )
- {
+ else if (cmSystemTools::FileIsDirectory(*i)) {
// we must compute the binPath from the srcPath, we just take the last
// element from the source path and use that
std::string binPath =
- std::string(this->Makefile->GetCurrentBinaryDirectory()) +
- "/" + cmSystemTools::GetFilenameName(*i);
- this->Makefile->AddSubDirectory(*i, binPath,
- excludeFromAll, false);
- }
- else
- {
+ std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" +
+ cmSystemTools::GetFilenameName(*i);
+ this->Makefile->AddSubDirectory(*i, binPath, excludeFromAll, false);
+ } else {
std::string error = "Incorrect SUBDIRS command. Directory: ";
error += *i + " does not exist.";
this->SetError(error);
res = false;
- }
}
+ }
return res;
}
-