Merge topic 'revert-automoc-src-per-dir'

091b649e Revert "Automoc: Fix support of files with the same name (#12873)"

1 files changed, 3 insertions, 32 deletions

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 226ab43..b16eccd 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1104,39 +1104,10 @@ void cmQtAutoGenerators::ParseHeaders(const std::set<std::string>& absHeaders,
         std::cout << "AUTOGEN: Checking " << headerName << std::endl;
         }
 
-      std::string headerDirectory;
-      if (cmsys::SystemTools::IsSubDirectory(headerName,
-                                             this->ProjectSourceDir))
-        {
-        headerDirectory = this->ProjectSourceDir;
-        }
-      else if (cmsys::SystemTools::IsSubDirectory(headerName,
-                                                  this->ProjectBinaryDir))
-        {
-        headerDirectory = this->ProjectBinaryDir;
-        }
-      else
-        {
-        cmsys::SystemTools::SplitPathRootComponent(headerName,
-                                                   &headerDirectory);
-        }
-
-      std::string baseHeaderName =
-        cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName);
-
-      headerDirectory = cmsys::SystemTools::RelativePath(
-        headerDirectory, cmsys::SystemTools::GetParentDirectory(headerName));
-
-      if (!headerDirectory.empty())
-        {
-        headerDirectory += "/";
-        }
-
-      std::string mocName = headerDirectory + baseHeaderName;
-
-      cmSystemTools::ReplaceString(mocName, "/", "_");
+      const std::string basename = cmsys::SystemTools::
+                                   GetFilenameWithoutLastExtension(headerName);
 
-      const std::string currentMoc = "moc_" + mocName + ".cpp";
+      const std::string currentMoc = "moc_" + basename + ".cpp";
       std::string macroName;
       if (requiresMocing(contents, macroName))
         {