summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-10-02 11:40:49 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-10-24 07:14:13 (GMT)
commitbe23dcfeb1ef2d855bd24bb933ae7da4a6b4b9da (patch)
tree425aa78eb4cd22a491bdd7bd99b67124fdeea2e4
parent52d5d4e9154644597630ed844a254dfb8de524dd (diff)
downloadCMake-be23dcfeb1ef2d855bd24bb933ae7da4a6b4b9da.zip
CMake-be23dcfeb1ef2d855bd24bb933ae7da4a6b4b9da.tar.gz
CMake-be23dcfeb1ef2d855bd24bb933ae7da4a6b4b9da.tar.bz2
Rename the cmake_automoc command to cmake_autogen.
There is no need for a "cmake_automoc" backward compatibility command because it is internal, undocumented, and only executed from a matching version of cmake.
-rw-r--r--Source/cmQtAutoGenerators.cxx2
-rw-r--r--Source/cmcmd.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 24f4498..ee30987 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -221,7 +221,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
cmCustomCommandLine currentLine;
currentLine.push_back(makefile->GetSafeDefinition("CMAKE_COMMAND"));
currentLine.push_back("-E");
- currentLine.push_back("cmake_automoc");
+ currentLine.push_back("cmake_autogen");
currentLine.push_back(targetDir);
currentLine.push_back("$<CONFIGURATION>");
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 79a3969..26251b3 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -632,7 +632,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
{
return cmcmd::ExecuteEchoColor(args);
}
- else if (args[1] == "cmake_automoc")
+ else if (args[1] == "cmake_autogen")
{
cmQtAutoGenerators autogen;
const char *config = args[3].empty() ? 0 : args[3].c_str();