diff options
| -rw-r--r-- | Source/cmAddSubDirectoryCommand.cxx | 8 | ||||
| -rw-r--r-- | Source/cmAddSubDirectoryCommand.h | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index 56d28a68ed..440f19d9ab 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -30,7 +30,6 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args) std::string srcArg; bool intoplevel = true; - bool preorder = false; // process the rest of the arguments looking for optional args std::vector<std::string>::const_iterator i = args.begin(); @@ -42,11 +41,6 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args) intoplevel = false; continue; } - else if(*i == "PREORDER") - { - preorder = true; - continue; - } else if (!srcArg.size()) { srcArg = *i; @@ -89,7 +83,7 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args) } m_Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(), - intoplevel, preorder, true); + intoplevel, false, true); return true; } diff --git a/Source/cmAddSubDirectoryCommand.h b/Source/cmAddSubDirectoryCommand.h index 6361a8c0ff..c54659c75c 100644 --- a/Source/cmAddSubDirectoryCommand.h +++ b/Source/cmAddSubDirectoryCommand.h @@ -63,7 +63,7 @@ public: { return " 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 " "directory in which to store the build files. If it is a relative " "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 " "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 " "will not be included in build by default. Users will have to " "explicitly start a build in the generated output directory. " |