Move automoc processing from add_executable/library to cmGlobalGenerator

Now automoc is enabled by setting the AUTOMOC target property to true,
instead of using the AUTOMOC keyword in add_executable() or add_library()

Alex

1 files changed, 1 insertions, 19 deletions

diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index ef75b3b..bac2430 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmAddExecutableCommand.h"
-#include "cmQtAutomoc.h"
 
 // cmExecutableCommand
 bool cmAddExecutableCommand
@@ -30,7 +29,6 @@ bool cmAddExecutableCommand
   bool use_macbundle = false;
   bool excludeFromAll = false;
   bool importTarget = false;
-  bool doAutomoc = false;
   while ( s != args.end() )
     {
     if (*s == "WIN32")
@@ -43,11 +41,6 @@ bool cmAddExecutableCommand
       ++s;
       use_macbundle = true;
       }
-    else if ( *s == "AUTOMOC" )
-      {
-      ++s;
-      doAutomoc = true;
-      }
     else if(*s == "EXCLUDE_FROM_ALL")
       {
       ++s;
@@ -66,17 +59,12 @@ bool cmAddExecutableCommand
 
   // Special modifiers are not allowed with IMPORTED signature.
   if(importTarget
-      && (use_win32 || use_macbundle || excludeFromAll  || doAutomoc))
+      && (use_win32 || use_macbundle || excludeFromAll))
     {
     if(use_win32)
       {
       this->SetError("may not be given WIN32 for an IMPORTED target.");
       }
-    else if(doAutomoc)
-      {
-      this->SetError(
-        "may not be given AUTOMOC for an IMPORTED target.");
-      }
     else if(use_macbundle)
       {
       this->SetError(
@@ -137,11 +125,5 @@ bool cmAddExecutableCommand
     tgt->SetProperty("MACOSX_BUNDLE", "ON");
     }
 
-  if ( doAutomoc )
-    {
-    cmQtAutomoc automoc;
-    automoc.SetupAutomocTarget(tgt);
-    }
-
   return true;
 }