diff options
author | Brad King <brad.king@kitware.com> | 2013-01-07 15:31:07 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-01-07 15:31:07 (GMT) |
commit | 09a0da77891bae3820b48c44c48bef3837b0a6e2 (patch) | |
tree | 18f5ee735b072f9c4bced34d668ca858243eb660 /Source/cmLoadCommandCommand.h | |
parent | d2d43986e7f5013465473a71c393fc3897cecbac (diff) | |
download | CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.zip CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.tar.gz CMake-09a0da77891bae3820b48c44c48bef3837b0a6e2.tar.bz2 |
Revert "load_command: Deprecate and document pending removal"
This reverts commit d2d43986e7f5013465473a71c393fc3897cecbac.
We will add a policy to remove the command more gracefully.
Diffstat (limited to 'Source/cmLoadCommandCommand.h')
-rw-r--r-- | Source/cmLoadCommandCommand.h | 15 |
1 files changed, 1 insertions, 14 deletions
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); }; |