Merge topic 'deprecate-load_command'

09a0da7 Revert "load_command: Deprecate and document pending removal"

2 files changed, 1 insertions, 18 deletions

diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 181b922..b2acf06 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -224,10 +224,6 @@ cmLoadedCommand::~cmLoadedCommand()
 bool cmLoadCommandCommand
 ::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
 {
-  this->Makefile->IssueMessage(
-    cmake::AUTHOR_WARNING,
-    "The \"load_command\" command will be removed in CMake 3.0.  "
-    "See command documentation for details.");
   if(args.size() < 1 )
     {
     return true;
diff --git a/Source/cmLoadCommandCommand.h b/Source/cmLoadCommandCommand.h
index bcd1831..f0b34ee 100644
--- a/Source/cmLoadCommandCommand.h
+++ b/Source/cmLoadCommandCommand.h
@@ -47,7 +47,7 @@ public:
    */
   virtual const char* GetTerseDocumentation() const
     {
-    return "Deprecated.  Use macro() or function() instead.";
+    return "Load a command into a running CMake.";
     }
 
   /**
@@ -56,13 +56,6 @@ public:
   virtual const char* GetFullDocumentation() const
     {
     return
-      "This command will be removed in CMake 3.0.  "
-      "It works only when the target architecture matches the "
-      "running CMake binary.  "
-      "Use macro() or function() to add commands.  "
-      "Use execute_process() to run advanced computations "
-      "in external processes."
-      "\n"
       "  load_command(COMMAND_NAME <loc1> [loc2 ...])\n"
       "The given locations are searched for a library whose name is "
       "cmCOMMAND_NAME.  If found, it is loaded as a module and the command "
@@ -74,12 +67,6 @@ public:
       "Otherwise the variable will not be set.";
     }
 
-  /** This command is kept for compatibility with older CMake versions. */
-  virtual bool IsDiscouraged() const
-    {
-    return true;
-    }
-
   cmTypeMacro(cmLoadCommandCommand, cmCommand);
 };