Merge topic 'revert-CMP0057'

32a2f414 Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."

3 files changed, 0 insertions, 34 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0935383..9f1d107 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -901,33 +901,6 @@ cmMakefile::AddCustomCommandToOutput(const std::vector<std::string>& outputs,
         }
       else
         {
-        std::ostringstream e;
-        cmake::MessageType messageType = cmake::AUTHOR_WARNING;
-        bool issueMessage = false;
-
-        switch(this->GetPolicyStatus(cmPolicies::CMP0057))
-          {
-          case cmPolicies::WARN:
-            e << (this->GetPolicies()->
-              GetPolicyWarning(cmPolicies::CMP0057)) << "\n";
-            issueMessage = true;
-          case cmPolicies::OLD:
-            break;
-          case cmPolicies::NEW:
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::REQUIRED_ALWAYS:
-            issueMessage = true;
-            messageType = cmake::FATAL_ERROR;
-            break;
-          }
-
-        if(issueMessage)
-          {
-          e << "\"" << main_dependency << "\" can only be specified as a "
-            "custom command MAIN_DEPENDENCY once.";
-          IssueMessage(messageType, e.str());
-          }
-
         // The existing custom command is different.  We need to
         // generate a rule file for this new command.
         file = 0;
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index e7678cb..ab60f93 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -377,11 +377,6 @@ cmPolicies::cmPolicies()
     3,2,0, cmPolicies::WARN);
 
   this->DefinePolicy(
-    CMP0057, "CMP0057",
-    "Disallow multiple MAIN_DEPENDENCY specifications for the same file.",
-    3,3,0, cmPolicies::WARN);
-
-  this->DefinePolicy(
     CMP0058, "CMP0058",
     "Ninja requires custom command byproducts to be explicit.",
     3,3,0, cmPolicies::WARN);
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 1d108c1..90acf8e 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -113,8 +113,6 @@ public:
     /// or keywords when unquoted.
     CMP0055, ///< Strict checking for break() command.
     CMP0056, ///< Honor link flags in try_compile() source-file signature.
-    CMP0057, ///< Disallow multiple MAIN_DEPENDENCY specifications
-    /// for the same file.
     CMP0058, ///< Ninja requires custom command byproducts to be explicit
     CMP0059, ///< Do not treat ``DEFINITIONS`` as a built-in directory
     /// property.