kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: removed the PREORDER option from the AddSubDirectory command

This commit is contained in:
Ken Martin 2005-05-31 15:10:04 -04:00
parent e26293f3ab
commit 664a93121f
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmAddSubDirectoryCommand.cxx
View File

@ -30,7 +30,6 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
std::string srcArg; std::string srcArg;
bool intoplevel = true; bool intoplevel = true;
bool preorder = false;
// process the rest of the arguments looking for optional args // process the rest of the arguments looking for optional args
std::vector<std::string>::const_iterator i = args.begin(); std::vector<std::string>::const_iterator i = args.begin();
@ -42,11 +41,6 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
intoplevel = false; intoplevel = false;
continue; continue;
} }
else if(*i == "PREORDER")
{
preorder = true;
continue;
}
else if (!srcArg.size()) else if (!srcArg.size())
{ {
srcArg = *i; srcArg = *i;
@ -89,7 +83,7 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
} }
m_Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(), m_Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(),
intoplevel, preorder, true); intoplevel, false, true);
return true; return true;
} }

8
Source/cmAddSubDirectoryCommand.h
View File

@ -63,7 +63,7 @@ public:
{ {
return return
" ADD_SUBDIRECTORY(binary_dir [source_dir]\n" " ADD_SUBDIRECTORY(binary_dir [source_dir]\n"
" [EXCLUDE_FROM_ALL] [PREORDER])\n" " [EXCLUDE_FROM_ALL])\n"
"Add a subdirectory to the build. The binary_dir specifies the " "Add a subdirectory to the build. The binary_dir specifies the "
"directory in which to store the build files. If it is a relative " "directory in which to store the build files. If it is a relative "
"path it will be evaluated with respect to the current output " "path it will be evaluated with respect to the current output "
@ -77,12 +77,6 @@ public:
"be processed immediately by CMake before processing in the current " "be processed immediately by CMake before processing in the current "
"input file continues beyond this command.\n" "input file continues beyond this command.\n"
"The PREORDER flag tells recursive makefile generators to build "
"targets in the subdirectory before those in the current directory. "
"If this flag is not specified then the targets in the current "
"directory are always built first. The PREORDER flag has no meaning "
"for global build system generators.\n"
"If the EXCLUDE_FROM_ALL argument is provided then this subdirectory " "If the EXCLUDE_FROM_ALL argument is provided then this subdirectory "
"will not be included in build by default. Users will have to " "will not be included in build by default. Users will have to "
"explicitly start a build in the generated output directory. " "explicitly start a build in the generated output directory. "