diff options
| author | Ken Martin <ken.martin@kitware.com> | 2007-03-12 14:26:59 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2007-03-12 14:26:59 (GMT) |
| commit | b99129d2d81a494055d40443e8e044c9db4ca807 (patch) | |
| tree | 07cbf0e96e3cb1480e182f5bbbf860d2224beade /Source/cmSubdirCommand.cxx | |
| parent | cf7eeab37aa644a0a09cb40e8958d99e8d771857 (diff) | |
| download | CMake-b99129d2d81a494055d40443e8e044c9db4ca807.zip CMake-b99129d2d81a494055d40443e8e044c9db4ca807.tar.gz CMake-b99129d2d81a494055d40443e8e044c9db4ca807.tar.bz2 | |
ENH: some code cleanup
Diffstat (limited to 'Source/cmSubdirCommand.cxx')
| -rw-r--r-- | Source/cmSubdirCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx index 207dfec..48b558d 100644 --- a/Source/cmSubdirCommand.cxx +++ b/Source/cmSubdirCommand.cxx @@ -25,7 +25,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) return false; } bool res = true; - bool intoplevel = true; + bool excludeFromAll = false; bool preorder = false; for(std::vector<std::string>::const_iterator i = args.begin(); @@ -33,7 +33,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) { if(*i == "EXCLUDE_FROM_ALL") { - intoplevel = false; + excludeFromAll = true; continue; } if(*i == "PREORDER") @@ -52,7 +52,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) std::string(this->Makefile->GetCurrentOutputDirectory()) + "/" + i->c_str(); this->Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(), - intoplevel, preorder, false); + excludeFromAll, preorder, false); } // otherwise it is a full path else if ( cmSystemTools::FileIsDirectory(i->c_str()) ) @@ -63,7 +63,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) std::string(this->Makefile->GetCurrentOutputDirectory()) + "/" + cmSystemTools::GetFilenameName(i->c_str()); this->Makefile->AddSubDirectory(i->c_str(), binPath.c_str(), - intoplevel, preorder, false); + excludeFromAll, preorder, false); } else { |