Merge topic 'deprecate-load_command'

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

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;

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);
 };
 

Tests/RunCMake/CMakeLists.txt

@@ -56,7 +56,6 @@ add_RunCMake_test(find_package)
 add_RunCMake_test(include)
 add_RunCMake_test(include_directories)
 add_RunCMake_test(list)
-add_RunCMake_test(load_command)
 
 if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
   add_RunCMake_test(include_external_msproject)

Tests/RunCMake/load_command/CMakeLists.txt

@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)

Tests/RunCMake/load_command/LoadCommandDeprecated-stderr.txt

@@ -1,6 +0,0 @@
-CMake Warning \(dev\) at LoadCommandDeprecated.cmake:1 \(load_command\):
-  The "load_command" command will be removed in CMake 3.0.  See command
-  documentation for details.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
-This warning is for project developers.  Use -Wno-dev to suppress it.

Tests/RunCMake/load_command/LoadCommandDeprecated.cmake

@@ -1 +0,0 @@
-load_command()

Tests/RunCMake/load_command/RunCMakeTest.cmake

@@ -1,3 +0,0 @@
-include(RunCMake)
-
-run_cmake(LoadCommandDeprecated)