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, 22 deletions

diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index f0b2e0d..efa29e6 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -12,7 +12,6 @@
 #include "cmAddLibraryCommand.h"
 
 #include "cmake.h"
-#include "cmQtAutomoc.h"
 
 // cmLibraryCommand
 bool cmAddLibraryCommand
@@ -32,7 +31,6 @@ bool cmAddLibraryCommand
     }
   bool excludeFromAll = false;
   bool importTarget = false;
-  bool doAutomoc = false;
 
   std::vector<std::string>::const_iterator s = args.begin();
 
@@ -81,11 +79,6 @@ bool cmAddLibraryCommand
       ++s;
       importTarget = true;
       }
-    else if (*s == "AUTOMOC")
-      {
-      ++s;
-      doAutomoc = true;
-      }
     else
       {
       break;
@@ -120,13 +113,6 @@ bool cmAddLibraryCommand
       return false;
       }
 
-    // Don't run automoc on an imported library
-    if (doAutomoc)
-      {
-      this->SetError("cannot be called with AUTOMOC for an IMPORTED library.");
-      return false;
-      }
-
     // Make sure the target does not already exist.
     if(this->Makefile->FindTargetToUse(libName.c_str()))
       {
@@ -178,14 +164,7 @@ bool cmAddLibraryCommand
     ++s;
     }
 
-  cmTarget* tgt =this->Makefile->AddLibrary(libName.c_str(), type, srclists,
-                                            excludeFromAll);
-
-  if ( doAutomoc )
-    {
-    cmQtAutomoc automoc;
-    automoc.SetupAutomocTarget(tgt);
-    }
+  this->Makefile->AddLibrary(libName.c_str(), type, srclists, excludeFromAll);
 
   return true;
 }