[Cmake-commits] CMake branch, master, updated. v3.10.1-625-g4bc5c08

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4bc5c08476f28a23f42b4566a760b21cef60c4b3 (commit)
       via  7341930ade835ce48641b5415cdd3f738772edf2 (commit)
       via  671958d2884e2d2597362265620b73f43d414870 (commit)
       via  10f58b27ac1015e4f1615372bb5168e43afcdf3a (commit)
       via  540d08f4858ddbb8d0356f77f878b9fbb7af8f80 (commit)
       via  b1504f9f97849777f4690565f8b5879372e7dd51 (commit)
       via  e9fcd1545facf6300181db843260008e1069c7b4 (commit)
       via  54b4ff2aee015768a990cb3fccb79f8e87b38a19 (commit)
       via  4988746e76703269d76c3fb633bafc0767fafbe4 (commit)
       via  6ce6fd426ee7649a40c2f253dbc5f814650f0992 (commit)
       via  45b6776ab301f4b5ec51e27863ffe061b1a0d60a (commit)
       via  d7868687c814cded6319dd0cfd9fff5c737bf0f0 (commit)
       via  b8ef28ae1f442144f55e23b8defffe01aa350c44 (commit)
       via  0b6ad59ea6b74379f4aefb42c2402355c393c656 (commit)
       via  a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2 (commit)
       via  cc66d356510c51b5240239a212a511fb0d23dc9a (commit)
       via  7971202b3c58f78008f5b651c048910fcc49c49f (commit)
       via  fb7e52ca3d920ca1de8b2abb23da3d83db988eca (commit)
       via  5cab8c307c7df585152e3ab9e007574cb0e690dc (commit)
       via  f11321efd11ce4958d45f4673465b5b9484f1af2 (commit)
       via  0af9da29e487f0a6c60c379f0773a68b40ce2625 (commit)
       via  f658bdaa7c7899a46caf402d4114999019897d46 (commit)
       via  f00e6c7c7024a784d2da310ba7b5f4a67e60fdff (commit)
       via  6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9 (commit)
       via  0b8597a86ee8bed2c34f52d309fd57b5f29a1595 (commit)
       via  227a7974f426e0966d1736c66dd606b068985d1b (commit)
       via  7d1ed84ceaa1c3467c091de302c778b5989bd03c (commit)
      from  1e148aba7078359e2e5b4d7080a6e1cb6592d94a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bc5c08476f28a23f42b4566a760b21cef60c4b3
commit 4bc5c08476f28a23f42b4566a760b21cef60c4b3
Merge: 7341930 10f58b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 14 13:21:40 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 14 08:21:52 2017 -0500

    Merge topic 'per-source-COMPILE_LANGUAGE-genex-support'
    
    10f58b27 Genex: Per-source $<COMPILE_LANGUAGE:...> support
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1575


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7341930ade835ce48641b5415cdd3f738772edf2
commit 7341930ade835ce48641b5415cdd3f738772edf2
Merge: 671958d 540d08f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 14 13:21:21 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 14 08:21:28 2017 -0500

    Merge topic 'autogen-separate-tests'
    
    540d08f4 Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterface
    b1504f9f Autogen: Tests: Separate RerunRccDepends test
    e9fcd154 Autogen: Tests: Separate RerunMocPlugin test
    54b4ff2a Autogen: Tests: Separate RerunMocBasic test
    4988746e Autogen: Tests: Separate Complex test
    6ce6fd42 Autogen: Tests: Separate StaticLibraryCycle test
    45b6776a Autogen: Tests: Separate SameName test
    d7868687 Autogen: Tests: Separate MacOsFW test
    ...
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1578


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=671958d2884e2d2597362265620b73f43d414870
commit 671958d2884e2d2597362265620b73f43d414870
Merge: 1e148ab 7d1ed84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 14 13:18:47 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 14 08:18:53 2017 -0500

    Merge topic 'irsl-intel-fortran-only-fix'
    
    7d1ed84c IRSL: Skip libgfxoffload if no Intel C++ is used
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1589


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10f58b27ac1015e4f1615372bb5168e43afcdf3a
commit 10f58b27ac1015e4f1615372bb5168e43afcdf3a
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Wed Dec 13 16:34:11 2017 +0100
Commit:     Marc Chevrier <marc.chevrier at sap.com>
CommitDate: Wed Dec 13 16:35:22 2017 +0100

    Genex: Per-source $<COMPILE_LANGUAGE:...> support
    
    Fixes: #17542

diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index bd1b6bb..c7197f2 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -361,9 +361,11 @@ std::string cmExtraSublimeTextGenerator::ComputeFlagsForObject(
   }
 
   // Add source file specific flags.
-  if (const char* cflags = source->GetProperty("COMPILE_FLAGS")) {
-    cmGeneratorExpressionInterpreter genexInterpreter(lg, gtgt, config);
-    lg->AppendFlags(flags, genexInterpreter.Evaluate(cflags));
+  const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+  if (const char* cflags = source->GetProperty(COMPILE_FLAGS)) {
+    cmGeneratorExpressionInterpreter genexInterpreter(
+      lg, gtgt, config, gtgt->GetName(), language);
+    lg->AppendFlags(flags, genexInterpreter.Evaluate(cflags, COMPILE_FLAGS));
   }
 
   return flags;
@@ -379,7 +381,8 @@ std::string cmExtraSublimeTextGenerator::ComputeDefines(
   cmMakefile* makefile = lg->GetMakefile();
   const std::string& language = source->GetLanguage();
   const std::string& config = makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  cmGeneratorExpressionInterpreter genexInterpreter(lg, target, config);
+  cmGeneratorExpressionInterpreter genexInterpreter(
+    lg, target, config, target->GetName(), language);
 
   // Add the export symbol definition for shared library objects.
   if (const char* exportMacro = target->GetExportMacro()) {
@@ -388,14 +391,17 @@ std::string cmExtraSublimeTextGenerator::ComputeDefines(
 
   // Add preprocessor definitions for this target and configuration.
   lg->AddCompileDefinitions(defines, target, config, language);
-  if (const char* compile_defs = source->GetProperty("COMPILE_DEFINITIONS")) {
-    lg->AppendDefines(defines, genexInterpreter.Evaluate(compile_defs));
+  const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
+  if (const char* compile_defs = source->GetProperty(COMPILE_DEFINITIONS)) {
+    lg->AppendDefines(
+      defines, genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS));
   }
 
   std::string defPropName = "COMPILE_DEFINITIONS_";
   defPropName += cmSystemTools::UpperCase(config);
   if (const char* config_compile_defs = source->GetProperty(defPropName)) {
-    lg->AppendDefines(defines, genexInterpreter.Evaluate(config_compile_defs));
+    lg->AppendDefines(defines, genexInterpreter.Evaluate(config_compile_defs,
+                                                         COMPILE_DEFINITIONS));
   }
 
   std::string definesString;
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 86991c1..6979b38 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -9,6 +9,7 @@
 #include "assert.h"
 #include "cmAlgorithms.h"
 #include "cmGeneratorExpressionContext.h"
+#include "cmGeneratorExpressionDAGChecker.h"
 #include "cmGeneratorExpressionEvaluator.h"
 #include "cmGeneratorExpressionLexer.h"
 #include "cmGeneratorExpressionParser.h"
@@ -385,3 +386,18 @@ void cmCompiledGeneratorExpression::GetMaxLanguageStandard(
     mapping = it->second;
   }
 }
+
+const char* cmGeneratorExpressionInterpreter::Evaluate(
+  const char* expression, const std::string& property)
+{
+  if (this->Target.empty()) {
+    return this->EvaluateExpression(expression);
+  }
+
+  // Specify COMPILE_OPTIONS to DAGchecker, same semantic as COMPILE_FLAGS
+  cmGeneratorExpressionDAGChecker dagChecker(
+    this->Target, property == "COMPILE_FLAGS" ? "COMPILE_OPTIONS" : property,
+    nullptr, nullptr);
+
+  return this->EvaluateExpression(expression, &dagChecker);
+}
diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h
index 611fbf8..9fd53c6 100644
--- a/Source/cmGeneratorExpression.h
+++ b/Source/cmGeneratorExpression.h
@@ -160,25 +160,38 @@ class cmGeneratorExpressionInterpreter
 public:
   cmGeneratorExpressionInterpreter(cmLocalGenerator* localGenerator,
                                    cmGeneratorTarget* generatorTarget,
-                                   const std::string& config)
+                                   const std::string& config,
+                                   const std::string& target,
+                                   const std::string& lang)
     : LocalGenerator(localGenerator)
     , GeneratorTarget(generatorTarget)
     , Config(config)
+    , Target(target)
+    , Language(lang)
+  {
+  }
+  cmGeneratorExpressionInterpreter(cmLocalGenerator* localGenerator,
+                                   cmGeneratorTarget* generatorTarget,
+                                   const std::string& config)
+    : cmGeneratorExpressionInterpreter(localGenerator, generatorTarget, config,
+                                       std::string(), std::string())
   {
   }
 
   const char* Evaluate(const char* expression)
   {
-    this->CompiledGeneratorExpression =
-      this->GeneratorExpression.Parse(expression);
-
-    return this->CompiledGeneratorExpression->Evaluate(
-      this->LocalGenerator, this->Config, false, this->GeneratorTarget);
+    return this->EvaluateExpression(expression);
   }
   const char* Evaluate(const std::string& expression)
   {
     return this->Evaluate(expression.c_str());
   }
+  const char* Evaluate(const char* expression, const std::string& property);
+  const char* Evaluate(const std::string& expression,
+                       const std::string& property)
+  {
+    return this->Evaluate(expression.c_str(), property);
+  }
 
 protected:
   cmGeneratorExpression& GetGeneratorExpression()
@@ -195,12 +208,34 @@ protected:
 
   cmGeneratorTarget* GetGeneratorTarget() { return this->GeneratorTarget; }
 
+  const std::string& GetTargetName() const { return this->Target; }
+  const std::string& GetLanguage() const { return this->Language; }
+
+  const char* EvaluateExpression(
+    const char* expression,
+    cmGeneratorExpressionDAGChecker* dagChecker = nullptr)
+  {
+    this->CompiledGeneratorExpression =
+      this->GeneratorExpression.Parse(expression);
+
+    if (dagChecker == nullptr) {
+      return this->CompiledGeneratorExpression->Evaluate(
+        this->LocalGenerator, this->Config, false, this->GeneratorTarget);
+    }
+
+    return this->CompiledGeneratorExpression->Evaluate(
+      this->LocalGenerator, this->Config, false, this->GeneratorTarget,
+      dagChecker, this->Language);
+  }
+
 private:
   cmGeneratorExpression GeneratorExpression;
   std::unique_ptr<cmCompiledGeneratorExpression> CompiledGeneratorExpression;
   cmLocalGenerator* LocalGenerator = nullptr;
   cmGeneratorTarget* GeneratorTarget = nullptr;
   std::string Config;
+  std::string Target;
+  std::string Language;
 };
 
 #endif
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bbf4175..6223be8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -684,18 +684,21 @@ class XCodeGeneratorExpressionInterpreter
 public:
   XCodeGeneratorExpressionInterpreter(cmSourceFile* sourceFile,
                                       cmLocalGenerator* localGenerator,
-                                      cmGeneratorTarget* generatorTarget)
+                                      cmGeneratorTarget* generatorTarget,
+                                      const std::string& lang)
     : cmGeneratorExpressionInterpreter(localGenerator, generatorTarget,
-                                       "NO-PER-CONFIG-SUPPORT-IN-XCODE")
+                                       "NO-PER-CONFIG-SUPPORT-IN-XCODE",
+                                       generatorTarget->GetName(), lang)
     , SourceFile(sourceFile)
   {
   }
 
   using cmGeneratorExpressionInterpreter::Evaluate;
 
-  const char* Evaluate(const char* expression, const char* property)
+  const char* Evaluate(const char* expression, const std::string& property)
   {
-    const char* processed = this->Evaluate(expression);
+    const char* processed =
+      this->cmGeneratorExpressionInterpreter::Evaluate(expression, property);
     if (this->GetCompiledGeneratorExpression()
           .GetHadContextSensitiveCondition()) {
       std::ostringstream e;
@@ -719,7 +722,9 @@ private:
 cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
   cmLocalGenerator* lg, cmSourceFile* sf, cmGeneratorTarget* gtgt)
 {
-  XCodeGeneratorExpressionInterpreter genexInterpreter(sf, lg, gtgt);
+  std::string lang = this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
+
+  XCodeGeneratorExpressionInterpreter genexInterpreter(sf, lg, gtgt, lang);
 
   // Add flags from target and source file properties.
   std::string flags;
@@ -734,16 +739,18 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
     default:
       break;
   }
-  if (const char* cflags = sf->GetProperty("COMPILE_FLAGS")) {
-    lg->AppendFlags(flags, genexInterpreter.Evaluate(cflags, "COMPILE_FLAGS"));
+  const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+  if (const char* cflags = sf->GetProperty(COMPILE_FLAGS)) {
+    lg->AppendFlags(flags, genexInterpreter.Evaluate(cflags, COMPILE_FLAGS));
   }
 
   // Add per-source definitions.
   BuildObjectListOrString flagsBuild(this, false);
-  if (const char* compile_defs = sf->GetProperty("COMPILE_DEFINITIONS")) {
+  const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
+  if (const char* compile_defs = sf->GetProperty(COMPILE_DEFINITIONS)) {
     this->AppendDefines(
-      flagsBuild,
-      genexInterpreter.Evaluate(compile_defs, "COMPILE_DEFINITIONS"), true);
+      flagsBuild, genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS),
+      true);
   }
   if (!flagsBuild.IsEmpty()) {
     if (!flags.empty()) {
@@ -752,8 +759,6 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
     flags += flagsBuild.GetString();
   }
 
-  std::string lang = this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
-
   cmXCodeObject* buildFile =
     this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
 
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 53966cd..4121190 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1458,14 +1458,28 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo(
        i != configs.end(); ++i, ++ci) {
     std::string configUpper = cmSystemTools::UpperCase(*i);
     cmLVS7GFileConfig fc;
-    cmGeneratorExpressionInterpreter genexInterpreter(lg, gt, *i);
+
+    std::string lang =
+      lg->GlobalGenerator->GetLanguageFromExtension(sf.GetExtension().c_str());
+    const std::string& sourceLang = lg->GetSourceFileLanguage(sf);
+    bool needForceLang = false;
+    // source file does not match its extension language
+    if (lang != sourceLang) {
+      needForceLang = true;
+      lang = sourceLang;
+    }
+
+    cmGeneratorExpressionInterpreter genexInterpreter(lg, gt, *i,
+                                                      gt->GetName(), lang);
+
     bool needfc = false;
     if (!objectName.empty()) {
       fc.ObjectName = objectName;
       needfc = true;
     }
-    if (const char* cflags = sf.GetProperty("COMPILE_FLAGS")) {
-      fc.CompileFlags = genexInterpreter.Evaluate(cflags);
+    const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+    if (const char* cflags = sf.GetProperty(COMPILE_FLAGS)) {
+      fc.CompileFlags = genexInterpreter.Evaluate(cflags, COMPILE_FLAGS);
       needfc = true;
     }
     if (lg->FortranProject) {
@@ -1483,14 +1497,16 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo(
           break;
       }
     }
-    if (const char* cdefs = sf.GetProperty("COMPILE_DEFINITIONS")) {
-      fc.CompileDefs = genexInterpreter.Evaluate(cdefs);
+    const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
+    if (const char* cdefs = sf.GetProperty(COMPILE_DEFINITIONS)) {
+      fc.CompileDefs = genexInterpreter.Evaluate(cdefs, COMPILE_DEFINITIONS);
       needfc = true;
     }
     std::string defPropName = "COMPILE_DEFINITIONS_";
     defPropName += configUpper;
     if (const char* ccdefs = sf.GetProperty(defPropName)) {
-      fc.CompileDefsConfig = genexInterpreter.Evaluate(ccdefs);
+      fc.CompileDefsConfig =
+        genexInterpreter.Evaluate(ccdefs, COMPILE_DEFINITIONS);
       needfc = true;
     }
 
@@ -1508,16 +1524,7 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo(
       }
     }
 
-    std::string lang =
-      lg->GlobalGenerator->GetLanguageFromExtension(sf.GetExtension().c_str());
-    const std::string& sourceLang = lg->GetSourceFileLanguage(sf);
     const std::string& linkLanguage = gt->GetLinkerLanguage(i->c_str());
-    bool needForceLang = false;
-    // source file does not match its extension language
-    if (lang != sourceLang) {
-      needForceLang = true;
-      lang = sourceLang;
-    }
     // If HEADER_FILE_ONLY is set, we must suppress this generation in
     // the project file
     fc.ExcludedFromBuild = sf.GetPropertyAsBool("HEADER_FILE_ONLY") ||
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 5e0c582..82506d2 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -426,7 +426,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
   std::string config = this->LocalGenerator->GetConfigName();
   std::string configUpper = cmSystemTools::UpperCase(config);
   cmGeneratorExpressionInterpreter genexInterpreter(
-    this->LocalGenerator, this->GeneratorTarget, config);
+    this->LocalGenerator, this->GeneratorTarget, config,
+    this->GeneratorTarget->GetName(), lang);
 
   // Add Fortran format flags.
   if (lang == "Fortran") {
@@ -434,8 +435,10 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
   }
 
   // Add flags from source file properties.
-  if (const char* cflags = source.GetProperty("COMPILE_FLAGS")) {
-    const char* evaluatedFlags = genexInterpreter.Evaluate(cflags);
+  const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+  if (const char* cflags = source.GetProperty(COMPILE_FLAGS)) {
+    const char* evaluatedFlags =
+      genexInterpreter.Evaluate(cflags, COMPILE_FLAGS);
     this->LocalGenerator->AppendFlags(flags, evaluatedFlags);
     *this->FlagFileStream << "# Custom flags: " << relativeObj
                           << "_FLAGS = " << evaluatedFlags << "\n"
@@ -446,8 +449,10 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
   std::set<std::string> defines;
 
   // Add source-sepcific preprocessor definitions.
-  if (const char* compile_defs = source.GetProperty("COMPILE_DEFINITIONS")) {
-    const char* evaluatedDefs = genexInterpreter.Evaluate(compile_defs);
+  const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
+  if (const char* compile_defs = source.GetProperty(COMPILE_DEFINITIONS)) {
+    const char* evaluatedDefs =
+      genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS);
     this->LocalGenerator->AppendDefines(defines, evaluatedDefs);
     *this->FlagFileStream << "# Custom defines: " << relativeObj
                           << "_DEFINES = " << evaluatedDefs << "\n"
@@ -456,7 +461,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
   std::string defPropName = "COMPILE_DEFINITIONS_";
   defPropName += configUpper;
   if (const char* config_compile_defs = source.GetProperty(defPropName)) {
-    const char* evaluatedDefs = genexInterpreter.Evaluate(config_compile_defs);
+    const char* evaluatedDefs =
+      genexInterpreter.Evaluate(config_compile_defs, COMPILE_DEFINITIONS);
     this->LocalGenerator->AppendDefines(defines, evaluatedDefs);
     *this->FlagFileStream << "# Custom defines: " << relativeObj << "_DEFINES_"
                           << configUpper << " = " << evaluatedDefs << "\n"
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 1036977..f967168 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -135,12 +135,14 @@ std::string cmNinjaTargetGenerator::ComputeFlagsForObject(
   }
 
   // Add source file specific flags.
-  if (const char* cflags = source->GetProperty("COMPILE_FLAGS")) {
+  const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+  if (const char* cflags = source->GetProperty(COMPILE_FLAGS)) {
     cmGeneratorExpressionInterpreter genexInterpreter(
       this->LocalGenerator, this->GeneratorTarget,
-      this->LocalGenerator->GetConfigName());
-    this->LocalGenerator->AppendFlags(flags,
-                                      genexInterpreter.Evaluate(cflags));
+      this->LocalGenerator->GetConfigName(), this->GeneratorTarget->GetName(),
+      language);
+    this->LocalGenerator->AppendFlags(
+      flags, genexInterpreter.Evaluate(cflags, COMPILE_FLAGS));
   }
 
   return flags;
@@ -179,18 +181,21 @@ std::string cmNinjaTargetGenerator::ComputeDefines(cmSourceFile const* source,
   std::set<std::string> defines;
   const std::string config = this->LocalGenerator->GetConfigName();
   cmGeneratorExpressionInterpreter genexInterpreter(
-    this->LocalGenerator, this->GeneratorTarget, config);
+    this->LocalGenerator, this->GeneratorTarget, config,
+    this->GeneratorTarget->GetName(), language);
 
-  if (const char* compile_defs = source->GetProperty("COMPILE_DEFINITIONS")) {
+  const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
+  if (const char* compile_defs = source->GetProperty(COMPILE_DEFINITIONS)) {
     this->LocalGenerator->AppendDefines(
-      defines, genexInterpreter.Evaluate(compile_defs));
+      defines, genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS));
   }
 
   std::string defPropName = "COMPILE_DEFINITIONS_";
   defPropName += cmSystemTools::UpperCase(config);
   if (const char* config_compile_defs = source->GetProperty(defPropName)) {
     this->LocalGenerator->AppendDefines(
-      defines, genexInterpreter.Evaluate(config_compile_defs));
+      defines,
+      genexInterpreter.Evaluate(config_compile_defs, COMPILE_DEFINITIONS));
   }
 
   std::string definesString = this->GetDefines(language);
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index ad66467..d745c49 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -691,8 +691,6 @@ static Json::Value DumpSourceFilesList(
 
   std::vector<cmSourceFile*> files;
   target->GetSourceFiles(files, config);
-  cmGeneratorExpressionInterpreter genexInterpreter(
-    target->GetLocalGenerator(), target, config);
 
   std::unordered_map<LanguageData, std::vector<std::string>> fileGroups;
   for (cmSourceFile* file : files) {
@@ -701,24 +699,31 @@ static Json::Value DumpSourceFilesList(
     if (!fileData.Language.empty()) {
       const LanguageData& ld = languageDataMap.at(fileData.Language);
       cmLocalGenerator* lg = target->GetLocalGenerator();
+      cmGeneratorExpressionInterpreter genexInterpreter(
+        lg, target, config, target->GetName(), fileData.Language);
 
       std::string compileFlags = ld.Flags;
-      if (const char* cflags = file->GetProperty("COMPILE_FLAGS")) {
-        lg->AppendFlags(compileFlags, genexInterpreter.Evaluate(cflags));
+      const std::string COMPILE_FLAGS("COMPILE_FLAGS");
+      if (const char* cflags = file->GetProperty(COMPILE_FLAGS)) {
+        lg->AppendFlags(compileFlags,
+                        genexInterpreter.Evaluate(cflags, COMPILE_FLAGS));
       }
       fileData.Flags = compileFlags;
 
       fileData.IncludePathList = ld.IncludePathList;
 
+      const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS");
       std::set<std::string> defines;
-      if (const char* defs = file->GetProperty("COMPILE_DEFINITIONS")) {
-        lg->AppendDefines(defines, genexInterpreter.Evaluate(defs));
+      if (const char* defs = file->GetProperty(COMPILE_DEFINITIONS)) {
+        lg->AppendDefines(
+          defines, genexInterpreter.Evaluate(defs, COMPILE_DEFINITIONS));
       }
 
       const std::string defPropName =
         "COMPILE_DEFINITIONS_" + cmSystemTools::UpperCase(config);
       if (const char* config_defs = file->GetProperty(defPropName)) {
-        lg->AppendDefines(defines, genexInterpreter.Evaluate(config_defs));
+        lg->AppendDefines(defines, genexInterpreter.Evaluate(
+                                     config_defs, COMPILE_DEFINITIONS));
       }
 
       defines.insert(ld.Defines.begin(), ld.Defines.end());
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 8589a96..2af3a0f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2152,7 +2152,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
         flagtable = gg->GetCSharpFlagTable();
       }
       cmGeneratorExpressionInterpreter genexInterpreter(
-        this->LocalGenerator, this->GeneratorTarget, *config);
+        this->LocalGenerator, this->GeneratorTarget, *config,
+        this->GeneratorTarget->GetName(), lang);
       cmVisualStudioGeneratorOptions clOptions(
         this->LocalGenerator, cmVisualStudioGeneratorOptions::Compiler,
         flagtable, 0, this);
@@ -2163,7 +2164,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
         clOptions.AddFlag("CompileAsWinRT", "false");
       }
       if (configDependentFlags) {
-        clOptions.Parse(genexInterpreter.Evaluate(flags));
+        clOptions.Parse(genexInterpreter.Evaluate(flags, "COMPILE_FLAGS"));
       } else {
         clOptions.Parse(flags.c_str());
       }
@@ -2176,7 +2177,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
                              "%(DisableSpecificWarnings)");
       }
       if (configDependentDefines) {
-        clOptions.AddDefines(genexInterpreter.Evaluate(configDefines));
+        clOptions.AddDefines(
+          genexInterpreter.Evaluate(configDefines, "COMPILE_DEFINITIONS"));
       } else {
         clOptions.AddDefines(configDefines.c_str());
       }
diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 5165970..0585d0c 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -263,9 +263,17 @@ add_custom_target(check-part4 ALL
 add_executable(srcgenex_flags srcgenex_flags.c)
 set_property(SOURCE srcgenex_flags.c PROPERTY COMPILE_FLAGS "-DNAME=$<TARGET_PROPERTY:NAME>")
 
+add_executable(srcgenex_flags_COMPILE_LANGUAGE srcgenex_flags_COMPILE_LANGUAGE.c)
+set_property(SOURCE srcgenex_flags_COMPILE_LANGUAGE.c PROPERTY COMPILE_FLAGS "$<$<COMPILE_LANGUAGE:C>:-DNAME=$<TARGET_PROPERTY:NAME>>")
+
 add_executable(srcgenex_defs srcgenex_defs.c)
 set_property(SOURCE srcgenex_defs.c PROPERTY COMPILE_DEFINITIONS NAME=$<TARGET_PROPERTY:NAME>)
 
+if (CMAKE_GENERATOR MATCHES "Makefiles|Ninja|Watcom WMake")
+  add_executable(srcgenex_defs_COMPILE_LANGUAGE srcgenex_defs_COMPILE_LANGUAGE.c)
+  set_property(SOURCE srcgenex_defs_COMPILE_LANGUAGE.c PROPERTY COMPILE_DEFINITIONS $<$<COMPILE_LANGUAGE:C>:NAME=$<TARGET_PROPERTY:NAME>>)
+endif()
+
 #-----------------------------------------------------------------------------
 # Cover test properties with generator expressions.
 add_executable(echo echo.c)
diff --git a/Tests/GeneratorExpression/srcgenex_defs_COMPILE_LANGUAGE.c b/Tests/GeneratorExpression/srcgenex_defs_COMPILE_LANGUAGE.c
new file mode 100644
index 0000000..421b55b
--- /dev/null
+++ b/Tests/GeneratorExpression/srcgenex_defs_COMPILE_LANGUAGE.c
@@ -0,0 +1,12 @@
+int srcgenex_defs_COMPILE_LANGUAGE(void)
+{
+  return 0;
+}
+
+int main(int argc, char* argv[])
+{
+#ifndef NAME
+#error NAME not defined
+#endif
+  return NAME();
+}
diff --git a/Tests/GeneratorExpression/srcgenex_flags_COMPILE_LANGUAGE.c b/Tests/GeneratorExpression/srcgenex_flags_COMPILE_LANGUAGE.c
new file mode 100644
index 0000000..4e80d6e
--- /dev/null
+++ b/Tests/GeneratorExpression/srcgenex_flags_COMPILE_LANGUAGE.c
@@ -0,0 +1,12 @@
+int srcgenex_flags_COMPILE_LANGUAGE(void)
+{
+  return 0;
+}
+
+int main(int argc, char* argv[])
+{
+#ifndef NAME
+#error NAME not defined
+#endif
+  return NAME();
+}
diff --git a/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-result.txt b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-VS.txt b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-VS.txt
new file mode 100644
index 0000000..5d19153
--- /dev/null
+++ b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-VS.txt
@@ -0,0 +1,7 @@
+CMake Error:
+  Error evaluating generator expression:
+
+    \$<COMPILE_LANGUAGE:CXX>
+
+  \$<COMPILE_LANGUAGE:...> may only be used for COMPILE_OPTIONS and
+  file\(GENERATE\) with the Visual Studio generator.
diff --git a/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-Xcode.txt b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-Xcode.txt
new file mode 100644
index 0000000..4a4564e
--- /dev/null
+++ b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-Xcode.txt
@@ -0,0 +1,7 @@
+CMake Error:
+  Error evaluating generator expression:
+
+    \$<COMPILE_LANGUAGE:CXX>
+
+  \$<COMPILE_LANGUAGE:...> may only be used for COMPILE_OPTIONS and
+  file\(GENERATE\) with the Xcode generator.
diff --git a/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions.cmake b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions.cmake
new file mode 100644
index 0000000..3a07d7d
--- /dev/null
+++ b/Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions.cmake
@@ -0,0 +1,5 @@
+
+enable_language(CXX)
+
+add_executable(main main.cpp)
+set_property(SOURCE main.cpp PROPERTY COMPILE_DEFINITIONS $<$<COMPILE_LANGUAGE:CXX>:ANYTHING>)
diff --git a/Tests/RunCMake/COMPILE_LANGUAGE-genex/RunCMakeTest.cmake b/Tests/RunCMake/COMPILE_LANGUAGE-genex/RunCMakeTest.cmake
index 421fa73..1a93dcd 100644
--- a/Tests/RunCMake/COMPILE_LANGUAGE-genex/RunCMakeTest.cmake
+++ b/Tests/RunCMake/COMPILE_LANGUAGE-genex/RunCMakeTest.cmake
@@ -14,3 +14,10 @@ elseif (RunCMake_GENERATOR MATCHES "Visual Studio")
     set(RunCMake-stderr-file IncludeDirectories-stderr-VS.txt)
     run_cmake(IncludeDirectories)
 endif()
+if (RunCMake_GENERATOR STREQUAL "Xcode")
+    set(RunCMake-stderr-file PerSourceCompileDefinitions-stderr-Xcode.txt)
+    run_cmake(PerSourceCompileDefinitions)
+elseif (RunCMake_GENERATOR MATCHES "Visual Studio")
+    set(RunCMake-stderr-file PerSourceCompileDefinitions-stderr-VS.txt)
+    run_cmake(PerSourceCompileDefinitions)
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=540d08f4858ddbb8d0356f77f878b9fbb7af8f80
commit 540d08f4858ddbb8d0356f77f878b9fbb7af8f80
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 9 13:50:12 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:19 2017 +0100

    Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterface

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 46dc224..5d8c2fe 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1242,18 +1242,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     )
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt")
 
-  # On Windows there is no RPATH, so while Qt might be available for building,
-  # the required dlls may not be in the PATH, so we can't run the executables
-  # on that platform.
-  if(WIN32)
-    set(run_autouic_test ${CMAKE_CTEST_COMMAND} -V)
-  else()
-    set(run_autouic_test QtAutoUicInterface)
-  endif()
-  if(NOT CMAKE_CONFIGURATION_TYPES)
-    set(QtAutogen_BUILD_OPTIONS -DCMAKE_BUILD_TYPE=$<CONFIGURATION>)
-  endif()
-
   if(NOT DEFINED CMake_TEST_Qt5)
     set(CMake_TEST_Qt5 1)
   endif()
@@ -1262,39 +1250,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   endif()
   if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
     add_subdirectory(Qt5Autogen)
-
-    add_test(Qt5AutoUicInterface ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutoUicInterface"
-      "${CMake_BINARY_DIR}/Tests/Qt5AutoUicInterface"
-      ${build_generator_args}
-      --build-project QtAutoUicInterface
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5AutoUicInterface"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5
-      --test-command ${run_autouic_test}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5AutoUicInterface")
   endif()
   if(QT4_WORKS AND QT_QTGUI_FOUND)
     add_subdirectory(Qt4Autogen)
 
-    add_test(Qt4AutoUicInterface ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutoUicInterface"
-      "${CMake_BINARY_DIR}/Tests/Qt4AutoUicInterface"
-      ${build_generator_args}
-      --build-project QtAutoUicInterface
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4AutoUicInterface"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        -DQT_TEST_VERSION=4
-      --test-command ${run_autouic_test}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4AutoUicInterface")
-
     add_test(Qt4Targets ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/Qt4Targets"
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 5746ab5..c56780e 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -24,6 +24,7 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocCMP0071)
 endif()
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
+ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
 ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutogen/UicInterface/CMakeLists.txt
similarity index 71%
rename from Tests/QtAutoUicInterface/CMakeLists.txt
rename to Tests/QtAutogen/UicInterface/CMakeLists.txt
index a5c2d99..a216aff 100644
--- a/Tests/QtAutoUicInterface/CMakeLists.txt
+++ b/Tests/QtAutogen/UicInterface/CMakeLists.txt
@@ -1,24 +1,6 @@
-
-cmake_minimum_required(VERSION 3.7)
-
-project(QtAutoUicInterface)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-
-  include(UseQt4)
-
-  set(QT_CORE_TARGET Qt4::QtCore)
-  set(QT_GUI_TARGET Qt4::QtGui)
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-  find_package(Qt5Widgets REQUIRED)
-
-  set(QT_CORE_TARGET Qt5::Core)
-  set(QT_GUI_TARGET Qt5::Widgets)
-endif()
+cmake_minimum_required(VERSION 3.10)
+project(UicInterface)
+include("../AutogenTest.cmake")
 
 set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 set(CMAKE_AUTOMOC ON)
@@ -29,7 +11,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 add_library(KI18n klocalizedstring.cpp)
-target_link_libraries(KI18n ${QT_CORE_TARGET})
+target_link_libraries(KI18n ${QT_QTCORE_TARGET})
 
 set(autouic_options
   -tr tr2$<$<NOT:$<BOOL:$<TARGET_PROPERTY:NO_KUIT_SEMANTIC>>>:x>i18n
@@ -61,12 +43,12 @@ set(INC_DIR "include" )
 endif()
 
 add_library(LibWidget libwidget.cpp)
-target_link_libraries(LibWidget KI18n ${QT_GUI_TARGET})
+target_link_libraries(LibWidget KI18n ${QT_QTGUI_TARGET})
 set_property(TARGET LibWidget PROPERTY NO_KUIT_SEMANTIC ON)
 set_property(TARGET LibWidget PROPERTY TRANSLATION_DOMAIN customdomain)
 
 add_library(MyWidget mywidget.cpp)
-target_link_libraries(MyWidget KI18n ${QT_GUI_TARGET})
+target_link_libraries(MyWidget KI18n ${QT_QTGUI_TARGET})
 
 add_executable(QtAutoUicInterface main.cpp)
 target_compile_definitions(QtAutoUicInterface
diff --git a/Tests/QtAutoUicInterface/klocalizedstring.cpp b/Tests/QtAutogen/UicInterface/klocalizedstring.cpp
similarity index 100%
rename from Tests/QtAutoUicInterface/klocalizedstring.cpp
rename to Tests/QtAutogen/UicInterface/klocalizedstring.cpp
diff --git a/Tests/QtAutoUicInterface/klocalizedstring.h b/Tests/QtAutogen/UicInterface/klocalizedstring.h
similarity index 100%
rename from Tests/QtAutoUicInterface/klocalizedstring.h
rename to Tests/QtAutogen/UicInterface/klocalizedstring.h
diff --git a/Tests/QtAutoUicInterface/libwidget.cpp b/Tests/QtAutogen/UicInterface/libwidget.cpp
similarity index 100%
rename from Tests/QtAutoUicInterface/libwidget.cpp
rename to Tests/QtAutogen/UicInterface/libwidget.cpp
diff --git a/Tests/QtAutoUicInterface/libwidget.h b/Tests/QtAutogen/UicInterface/libwidget.h
similarity index 100%
rename from Tests/QtAutoUicInterface/libwidget.h
rename to Tests/QtAutogen/UicInterface/libwidget.h
diff --git a/Tests/QtAutoUicInterface/libwidget.ui b/Tests/QtAutogen/UicInterface/libwidget.ui
similarity index 100%
rename from Tests/QtAutoUicInterface/libwidget.ui
rename to Tests/QtAutogen/UicInterface/libwidget.ui
diff --git a/Tests/QtAutoUicInterface/main.cpp b/Tests/QtAutogen/UicInterface/main.cpp
similarity index 100%
rename from Tests/QtAutoUicInterface/main.cpp
rename to Tests/QtAutogen/UicInterface/main.cpp
diff --git a/Tests/QtAutoUicInterface/mywidget.cpp b/Tests/QtAutogen/UicInterface/mywidget.cpp
similarity index 100%
rename from Tests/QtAutoUicInterface/mywidget.cpp
rename to Tests/QtAutogen/UicInterface/mywidget.cpp
diff --git a/Tests/QtAutoUicInterface/mywidget.h b/Tests/QtAutogen/UicInterface/mywidget.h
similarity index 100%
rename from Tests/QtAutoUicInterface/mywidget.h
rename to Tests/QtAutogen/UicInterface/mywidget.h
diff --git a/Tests/QtAutoUicInterface/mywidget.ui b/Tests/QtAutogen/UicInterface/mywidget.ui
similarity index 100%
rename from Tests/QtAutoUicInterface/mywidget.ui
rename to Tests/QtAutogen/UicInterface/mywidget.ui

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1504f9f97849777f4690565f8b5879372e7dd51
commit b1504f9f97849777f4690565f8b5879372e7dd51
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 9 13:30:54 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate RerunRccDepends test

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b0bf887..46dc224 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1263,21 +1263,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
     add_subdirectory(Qt5Autogen)
 
-    add_test(NAME Qt5AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun"
-      "${CMake_BINARY_DIR}/Tests/Qt5AutogenRerun"
-      ${build_generator_args}
-      --build-project QtAutogenRerun
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5AutogenRerun"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        -DQT_TEST_VERSION=5
-        ${QtAutogen_BUILD_OPTIONS}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5AutogenRerun")
-
     add_test(Qt5AutoUicInterface ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutoUicInterface"
@@ -1295,21 +1280,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(QT4_WORKS AND QT_QTGUI_FOUND)
     add_subdirectory(Qt4Autogen)
 
-    add_test(NAME Qt4AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun"
-      "${CMake_BINARY_DIR}/Tests/Qt4AutogenRerun"
-      ${build_generator_args}
-      --build-project QtAutogenRerun
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4AutogenRerun"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        -DQT_TEST_VERSION=4
-        ${QtAutogen_BUILD_OPTIONS}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4AutogenRerun")
-
     add_test(Qt4AutoUicInterface ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutoUicInterface"
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index b03c282..5746ab5 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -36,3 +36,4 @@ ADD_AUTOGEN_TEST(RerunMocBasic)
 if(NOT QT_TEST_VERSION STREQUAL 4)
   ADD_AUTOGEN_TEST(RerunMocPlugin)
 endif()
+ADD_AUTOGEN_TEST(RerunRccDepends)
diff --git a/Tests/QtAutogenRerun/rccDepends.cmake b/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
similarity index 92%
rename from Tests/QtAutogenRerun/rccDepends.cmake
rename to Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
index 68e1482..2e6a5bd 100644
--- a/Tests/QtAutogenRerun/rccDepends.cmake
+++ b/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
@@ -1,8 +1,17 @@
+cmake_minimum_required(VERSION 3.10)
+project(RerunRccDepends)
+include("../AutogenTest.cmake")
+
+# Tests rcc rebuilding when a resource file changes
+
+# Dummy executable to generate a clean target
+add_executable(dummy dummy.cpp)
+
 # When a .qrc or a file listed in a .qrc file changes,
 # the target must be rebuilt
 set(timeformat "%Y%j%H%M%S")
-set(rccDepSD "${CMAKE_CURRENT_SOURCE_DIR}/rccDepends")
-set(rccDepBD "${CMAKE_CURRENT_BINARY_DIR}/rccDepends")
+set(rccDepSD "${CMAKE_CURRENT_SOURCE_DIR}/RccDepends")
+set(rccDepBD "${CMAKE_CURRENT_BINARY_DIR}/RccDepends")
 
 # Initial build
 configure_file(${rccDepSD}/resPlainA.qrc.in ${rccDepBD}/resPlain.qrc COPYONLY)
@@ -10,10 +19,9 @@ configure_file(${rccDepSD}/resGenA.qrc.in ${rccDepBD}/resGen.qrc.in COPYONLY)
 try_compile(RCC_DEPENDS
   "${rccDepBD}"
   "${rccDepSD}"
-  rccDepends
-  CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
-              "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
-              "-DCMAKE_PREFIX_PATH=${Qt_PREFIX_DIR}"
+  RccDepends
+  CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
+              "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
   OUTPUT_VARIABLE output
 )
 if (NOT RCC_DEPENDS)
diff --git a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt b/Tests/QtAutogen/RerunRccDepends/RccDepends/CMakeLists.txt
similarity index 64%
rename from Tests/QtAutogenRerun/rccDepends/CMakeLists.txt
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/CMakeLists.txt
index 291592e..0507e61 100644
--- a/Tests/QtAutogenRerun/rccDepends/CMakeLists.txt
+++ b/Tests/QtAutogen/RerunRccDepends/RccDepends/CMakeLists.txt
@@ -1,17 +1,6 @@
-cmake_minimum_required(VERSION 3.9)
-project(rccDepends CXX)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-  set(QT_CORE_TARGET Qt4::QtCore)
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-
-  find_package(Qt5Core REQUIRED)
-  set(QT_CORE_TARGET Qt5::Core)
-endif()
+cmake_minimum_required(VERSION 3.10)
+project(RccDepends)
+include("../../AutogenTest.cmake")
 
 # Enable AUTORCC for all targets
 set(CMAKE_AUTORCC ON)
@@ -23,19 +12,22 @@ configure_file(resGen/input.txt.in resGen/input.txt COPYONLY)
 configure_file(resGen/input.txt.in resGen/inputAdded.txt COPYONLY)
 
 # Generated qrc file with dependency
-add_custom_command(OUTPUT resGen.qrc
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc.in
   COMMAND ${CMAKE_COMMAND} -E sleep 2
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc)
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc
+)
 
 # Target that uses a plain .qrc file
 add_executable(rccDependsPlain main.cpp ${CMAKE_CURRENT_BINARY_DIR}/resPlain.qrc)
-target_link_libraries(rccDependsPlain ${QT_CORE_TARGET})
+target_link_libraries(rccDependsPlain ${QT_QTCORE_TARGET})
 add_custom_command(TARGET rccDependsPlain POST_BUILD COMMAND
-  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:rccDependsPlain>" > targetPlain.txt)
+  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:rccDependsPlain>" > targetPlain.txt
+)
 
 # Target that uses a GENERATED .qrc file
 add_executable(rccDependsGen main.cpp ${CMAKE_CURRENT_BINARY_DIR}/resGen.qrc )
-target_link_libraries(rccDependsGen ${QT_CORE_TARGET})
+target_link_libraries(rccDependsGen ${QT_QTCORE_TARGET})
 add_custom_command(TARGET rccDependsGen POST_BUILD COMMAND
-  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:rccDependsGen>" > targetGen.txt)
+  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:rccDependsGen>" > targetGen.txt
+)
diff --git a/Tests/QtAutogenRerun/rccDepends/main.cpp b/Tests/QtAutogen/RerunRccDepends/RccDepends/main.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/main.cpp
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/main.cpp
diff --git a/Tests/QtAutogenRerun/rccDepends/resGen/input.txt.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resGen/input.txt.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resGen/input.txt.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resGen/input.txt.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resGen/inputAdded.txt.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resGen/inputAdded.txt.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resGen/inputAdded.txt.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resGen/inputAdded.txt.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resGenA.qrc.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resGenA.qrc.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resGenA.qrc.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resGenA.qrc.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resGenB.qrc.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resGenB.qrc.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resGenB.qrc.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resGenB.qrc.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resPlain/input.txt.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resPlain/input.txt.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resPlain/input.txt.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resPlain/input.txt.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resPlain/inputAdded.txt.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resPlain/inputAdded.txt.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resPlain/inputAdded.txt.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resPlain/inputAdded.txt.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resPlainA.qrc.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resPlainA.qrc.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resPlainA.qrc.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resPlainA.qrc.in
diff --git a/Tests/QtAutogenRerun/rccDepends/resPlainB.qrc.in b/Tests/QtAutogen/RerunRccDepends/RccDepends/resPlainB.qrc.in
similarity index 100%
rename from Tests/QtAutogenRerun/rccDepends/resPlainB.qrc.in
rename to Tests/QtAutogen/RerunRccDepends/RccDepends/resPlainB.qrc.in
diff --git a/Tests/QtAutogenRerun/dummy.cpp b/Tests/QtAutogen/RerunRccDepends/dummy.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/dummy.cpp
rename to Tests/QtAutogen/RerunRccDepends/dummy.cpp
diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt
deleted file mode 100644
index 9f1ee28..0000000
--- a/Tests/QtAutogenRerun/CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-cmake_policy(SET CMP0071 NEW)
-project(QtAutogenRerun)
-
-# Tell find_package(Qt5) where to find Qt.
-if(QT_QMAKE_EXECUTABLE)
-  get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
-  get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH)
-  list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
-endif()
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-
-  # Include this directory before using the UseQt4 file.
-  add_subdirectory(defines_test)
-
-  include(UseQt4)
-
-  set(QT_QTCORE_TARGET Qt4::QtCore)
-
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-  find_package(Qt5Widgets REQUIRED)
-
-  set(QT_QTCORE_TARGET Qt5::Core)
-
-  include_directories(${Qt5Widgets_INCLUDE_DIRS})
-  set(QT_LIBRARIES Qt5::Widgets)
-
-  if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
-    add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
-  endif()
-
-endif()
-
-# Dummy executable to generate clean target
-add_executable(dummy dummy.cpp)
-
-# -- Test
-include("rccDepends.cmake")
diff --git a/Tests/QtAutogenRerun/defines_test/CMakeLists.txt b/Tests/QtAutogenRerun/defines_test/CMakeLists.txt
deleted file mode 100644
index 9ee9a22..0000000
--- a/Tests/QtAutogenRerun/defines_test/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_executable(defines_test defines_test.cpp)
-set_target_properties(defines_test PROPERTIES AUTOMOC TRUE)
-target_link_libraries(defines_test Qt4::QtGui)
diff --git a/Tests/QtAutogenRerun/defines_test/defines_test.cpp b/Tests/QtAutogenRerun/defines_test/defines_test.cpp
deleted file mode 100644
index cf4e9cb..0000000
--- a/Tests/QtAutogenRerun/defines_test/defines_test.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#include <QObject>
-
-#ifdef QT_GUI_LIB
-#include <QTextDocument>
-
-class SomeDocument : public QTextDocument
-{
-  Q_OBJECT
-
-Q_SIGNALS:
-  void someSig();
-};
-#endif
-
-#ifdef QT_CORE_LIB
-class SomeObject : public QObject
-{
-  Q_OBJECT
-
-Q_SIGNALS:
-  void someSig();
-};
-#endif
-
-int main(int argc, char** argv)
-{
-#ifdef QT_CORE_LIB
-  QMetaObject sosmo = SomeObject::staticMetaObject;
-#endif
-#ifdef QT_GUI_LIB
-  QMetaObject sdsmo = SomeDocument::staticMetaObject;
-#endif
-
-  return 0;
-}
-
-#include "defines_test.moc"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9fcd1545facf6300181db843260008e1069c7b4
commit e9fcd1545facf6300181db843260008e1069c7b4
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 9 13:20:58 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate RerunMocPlugin test

diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 94413a3..b03c282 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -33,3 +33,6 @@ ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
 ADD_AUTOGEN_TEST(Complex QtAutogen)
 # Rerun tests
 ADD_AUTOGEN_TEST(RerunMocBasic)
+if(NOT QT_TEST_VERSION STREQUAL 4)
+  ADD_AUTOGEN_TEST(RerunMocPlugin)
+endif()
diff --git a/Tests/QtAutogenRerun/mocPlugin.cmake b/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt
similarity index 89%
rename from Tests/QtAutogenRerun/mocPlugin.cmake
rename to Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt
index 7ad5ccb..076de8b 100644
--- a/Tests/QtAutogenRerun/mocPlugin.cmake
+++ b/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt
@@ -1,16 +1,25 @@
+cmake_minimum_required(VERSION 3.10)
+project(RerunMocPlugin)
+include("../AutogenTest.cmake")
+
+# Tests Q_PLUGIN_METADATA and CMAKE_AUTOMOC_DEPEND_FILTERS
+# json file change detection
+
+# Dummy executable to generate a clean target
+add_executable(dummy dummy.cpp)
 
 # Utility variables
 set(timeformat "%Y%j%H%M%S")
-set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin")
-set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
+set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/MocPlugin")
+set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/MocPlugin")
 
 # Initial buid
 try_compile(MOC_PLUGIN
   "${mocPlugBinDir}"
   "${mocPlugSrcDir}"
-  mocPlugin
+  MocPlugin
   CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
-              "-DCMAKE_PREFIX_PATH=${Qt_PREFIX_DIR}"
+              "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
   OUTPUT_VARIABLE output
 )
 if (NOT MOC_PLUGIN)
diff --git a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
similarity index 78%
rename from Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
index b7cc5e9..bc0085f 100644
--- a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
@@ -1,19 +1,15 @@
-cmake_minimum_required(VERSION 3.9)
-project(mocPlugin CXX)
-
-set(CMAKE_AUTOMOC_DEPEND_FILTERS
-  "A_CUSTOM_MACRO"
-  "[\n][ \t]*A_CUSTOM_MACRO[ \t\r\n]*\\([^,]+,[ \t\r\n]*\"([^\"]+)\""
-  )
+cmake_minimum_required(VERSION 3.10)
+project(MocPlugin)
+include("../../AutogenTest.cmake")
 
 if (NOT QT_TEST_VERSION STREQUAL 5)
   message(SEND_ERROR "Invalid Qt version specified.")
 endif()
-find_package(Qt5Widgets REQUIRED)
 
-if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
-  add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
-endif()
+set(CMAKE_AUTOMOC_DEPEND_FILTERS
+  "A_CUSTOM_MACRO"
+  "[\n][ \t]*A_CUSTOM_MACRO[ \t\r\n]*\\([^,]+,[ \t\r\n]*\"([^\"]+)\""
+)
 
 configure_file(jsonIn/StyleC.json jsonFiles/StyleC.json)
 configure_file(jsonIn/StyleC.json jsonFiles/StyleC_Custom.json)
@@ -22,7 +18,7 @@ configure_file(jsonIn/StyleD.json jsonFiles/sub/StyleD_Custom.json)
 configure_file(jsonIn/StyleE.json jsonFiles/StyleE.json)
 configure_file(jsonIn/StyleE.json jsonFiles/StyleE_Custom.json)
 
-# Enable automoc
+# Enable AUTOMOC
 set(CMAKE_AUTOMOC TRUE)
 
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/jsonFiles")
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleA.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleA.cpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleA.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleA.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleA.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleA.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleA_Custom.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA_Custom.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleA_Custom.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleA_Custom.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleB.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleB.cpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleB.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleB.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleB.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleC.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleC.cpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleC.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleC.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleC.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleD.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleD.cpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleD.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleD.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleD.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleE.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleE.cpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleE.cpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleE.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleE.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleE.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleE.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleE.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/StyleEInclude.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/StyleEInclude.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/StyleEInclude.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/UtilityMacros.hpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/UtilityMacros.hpp
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/UtilityMacros.hpp
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/UtilityMacros.hpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleB.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleB.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleB.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleB.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleB_Custom.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleB_Custom.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleB_Custom.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleB_Custom.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleC.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleC.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleC.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleC.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleD.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleD.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleD.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleD.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleE.json b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleE.json
similarity index 100%
rename from Tests/QtAutogenRerun/mocPlugin/jsonIn/StyleE.json
rename to Tests/QtAutogen/RerunMocPlugin/MocPlugin/jsonIn/StyleE.json
diff --git a/Tests/QtAutogenRerun/mocPlugin/main.cpp b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/main.cpp
similarity index 100%
copy from Tests/QtAutogenRerun/mocPlugin/main.cpp
copy to Tests/QtAutogen/RerunMocPlugin/MocPlugin/main.cpp
diff --git a/Tests/QtAutogenRerun/mocPlugin/main.cpp b/Tests/QtAutogen/RerunMocPlugin/dummy.cpp
similarity index 69%
rename from Tests/QtAutogenRerun/mocPlugin/main.cpp
rename to Tests/QtAutogen/RerunMocPlugin/dummy.cpp
index 3ba2ddc..4837a76 100644
--- a/Tests/QtAutogenRerun/mocPlugin/main.cpp
+++ b/Tests/QtAutogen/RerunMocPlugin/dummy.cpp
@@ -1,4 +1,3 @@
-#include "StyleA.hpp"
 
 int main(int argv, char** args)
 {
diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt
index 746ba4a..9f1ee28 100644
--- a/Tests/QtAutogenRerun/CMakeLists.txt
+++ b/Tests/QtAutogenRerun/CMakeLists.txt
@@ -40,10 +40,4 @@ endif()
 add_executable(dummy dummy.cpp)
 
 # -- Test
-# Tests Q_PLUGIN_METADATA json file change detection
-if (NOT QT_TEST_VERSION STREQUAL 4)
-  include("mocPlugin.cmake")
-endif()
-
-# -- Test
 include("rccDepends.cmake")

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54b4ff2aee015768a990cb3fccb79f8e87b38a19
commit 54b4ff2aee015768a990cb3fccb79f8e87b38a19
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat Dec 9 13:06:58 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate RerunMocBasic test

diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 6921495..94413a3 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -31,3 +31,5 @@ endif()
 ADD_AUTOGEN_TEST(SameName sameName)
 ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
 ADD_AUTOGEN_TEST(Complex QtAutogen)
+# Rerun tests
+ADD_AUTOGEN_TEST(RerunMocBasic)
diff --git a/Tests/QtAutogen/RerunMocBasic/CMakeLists.txt b/Tests/QtAutogen/RerunMocBasic/CMakeLists.txt
new file mode 100644
index 0000000..0bb0339
--- /dev/null
+++ b/Tests/QtAutogen/RerunMocBasic/CMakeLists.txt
@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 3.10)
+project(RerunMocBasic)
+include("../AutogenTest.cmake")
+
+# Dummy executable to generate a clean target
+add_executable(dummy dummy.cpp)
+
+set(timeformat "%Y%j%H%M%S")
+set(mocBasicSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/MocBasic")
+set(mocBasicBinDir "${CMAKE_CURRENT_BINARY_DIR}/MocBasic")
+
+# Initial build
+configure_file("${mocBasicSrcDir}/test1a.h.in" "${mocBasicBinDir}/test1.h" COPYONLY)
+try_compile(MOC_RERUN
+  "${mocBasicBinDir}"
+  "${mocBasicSrcDir}"
+  MocBasic
+  CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
+              "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
+  OUTPUT_VARIABLE output
+)
+if (NOT MOC_RERUN)
+  message(SEND_ERROR "Initial build of mocBasic failed. Output: ${output}")
+endif()
+# Get name of the output binary
+file(STRINGS "${mocBasicBinDir}/mocBasic.txt" mocBasicList ENCODING UTF-8)
+list(GET mocBasicList 0 mocBasicBin)
+
+message("Changing the header content for a MOC rerun")
+# - Acquire binary timestamps before the build
+file(TIMESTAMP "${mocBasicBin}" timeBefore "${timeformat}")
+# - Ensure that the timestamp will change
+# - Change header file content and rebuild
+# - Rebuild
+execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
+configure_file("${mocBasicSrcDir}/test1b.h.in" "${mocBasicBinDir}/test1.h" COPYONLY)
+execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocBasicBinDir}" RESULT_VARIABLE result )
+if (result)
+  message(SEND_ERROR "Second build of mocBasic failed.")
+endif()
+# - Acquire binary timestamps after the build
+file(TIMESTAMP "${mocBasicBin}" timeAfter "${timeformat}")
+# - Test if timestamps changed
+if (NOT timeAfter GREATER timeBefore)
+  message(SEND_ERROR "File (${mocBasicBin}) should have changed!")
+endif()
+
+
+message("Changing nothing for a MOC rerun")
+# - Acquire binary timestamps before the build
+file(TIMESTAMP "${mocBasicBin}" timeBefore "${timeformat}")
+# - Ensure that the timestamp would change
+# - Change nothing
+# - Rebuild
+execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
+execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocBasicBinDir}" RESULT_VARIABLE result )
+if (result)
+  message(SEND_ERROR "Third build of mocBasic failed.")
+endif()
+# - Acquire binary timestamps after the build
+file(TIMESTAMP "${mocBasicBin}" timeAfter "${timeformat}")
+# - Test if timestamps changed
+if (timeAfter GREATER timeBefore)
+  message(SEND_ERROR "File (${mocBasicBin}) should not have changed!")
+endif()
diff --git a/Tests/QtAutogen/RerunMocBasic/MocBasic/CMakeLists.txt b/Tests/QtAutogen/RerunMocBasic/MocBasic/CMakeLists.txt
new file mode 100644
index 0000000..cec60a4
--- /dev/null
+++ b/Tests/QtAutogen/RerunMocBasic/MocBasic/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocBasic)
+include("../../AutogenTest.cmake")
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+# Generated source file
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+  COMMAND ${CMAKE_COMMAND} -E sleep 2
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+)
+
+add_executable(mocBasic
+  ${CMAKE_CURRENT_BINARY_DIR}/test1.h
+  ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+  res1.qrc
+)
+target_include_directories(mocBasic PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(mocBasic ${QT_QTCORE_TARGET})
+# Write target name to text file
+add_custom_command(TARGET mocBasic POST_BUILD COMMAND
+  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:mocBasic>" > mocBasic.txt
+)
diff --git a/Tests/QtAutogenRerun/mocRerun/input.txt b/Tests/QtAutogen/RerunMocBasic/MocBasic/input.txt
similarity index 100%
rename from Tests/QtAutogenRerun/mocRerun/input.txt
rename to Tests/QtAutogen/RerunMocBasic/MocBasic/input.txt
diff --git a/Tests/QtAutogenRerun/mocRerun/main.cpp.in b/Tests/QtAutogen/RerunMocBasic/MocBasic/main.cpp.in
similarity index 58%
rename from Tests/QtAutogenRerun/mocRerun/main.cpp.in
rename to Tests/QtAutogen/RerunMocBasic/MocBasic/main.cpp.in
index b37ff61..9d7ea37 100644
--- a/Tests/QtAutogenRerun/mocRerun/main.cpp.in
+++ b/Tests/QtAutogen/RerunMocBasic/MocBasic/main.cpp.in
@@ -1,5 +1,7 @@
 #include "test1.h"
 
+extern int qInitResources_res1();
+
 class Test2 : public QObject
 {
   Q_OBJECT
@@ -9,6 +11,9 @@ public slots:
 
 int main()
 {
+  // Fails to link if the rcc generated symbol is not present.
+  qInitResources_res1();
+
   Test1 test1;
   Test2 test2;
 
diff --git a/Tests/QtAutogenRerun/mocRerun/res1.qrc b/Tests/QtAutogen/RerunMocBasic/MocBasic/res1.qrc
similarity index 100%
rename from Tests/QtAutogenRerun/mocRerun/res1.qrc
rename to Tests/QtAutogen/RerunMocBasic/MocBasic/res1.qrc
diff --git a/Tests/QtAutogenRerun/mocRerun/test1a.h.in b/Tests/QtAutogen/RerunMocBasic/MocBasic/test1a.h.in
similarity index 100%
rename from Tests/QtAutogenRerun/mocRerun/test1a.h.in
rename to Tests/QtAutogen/RerunMocBasic/MocBasic/test1a.h.in
diff --git a/Tests/QtAutogenRerun/mocRerun/test1b.h.in b/Tests/QtAutogen/RerunMocBasic/MocBasic/test1b.h.in
similarity index 100%
rename from Tests/QtAutogenRerun/mocRerun/test1b.h.in
rename to Tests/QtAutogen/RerunMocBasic/MocBasic/test1b.h.in
diff --git a/Tests/QtAutogen/RerunMocBasic/dummy.cpp b/Tests/QtAutogen/RerunMocBasic/dummy.cpp
new file mode 100644
index 0000000..4837a76
--- /dev/null
+++ b/Tests/QtAutogen/RerunMocBasic/dummy.cpp
@@ -0,0 +1,5 @@
+
+int main(int argv, char** args)
+{
+  return 0;
+}
diff --git a/Tests/QtAutogenRerun/CMakeLists.txt b/Tests/QtAutogenRerun/CMakeLists.txt
index e72c191..746ba4a 100644
--- a/Tests/QtAutogenRerun/CMakeLists.txt
+++ b/Tests/QtAutogenRerun/CMakeLists.txt
@@ -6,7 +6,7 @@ project(QtAutogenRerun)
 if(QT_QMAKE_EXECUTABLE)
   get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
   get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH)
-  set(CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
+  list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
 endif()
 
 if (QT_TEST_VERSION STREQUAL 4)
@@ -40,9 +40,6 @@ endif()
 add_executable(dummy dummy.cpp)
 
 # -- Test
-include("mocRerun.cmake")
-
-# -- Test
 # Tests Q_PLUGIN_METADATA json file change detection
 if (NOT QT_TEST_VERSION STREQUAL 4)
   include("mocPlugin.cmake")
diff --git a/Tests/QtAutogenRerun/mocRerun.cmake b/Tests/QtAutogenRerun/mocRerun.cmake
deleted file mode 100644
index a92912b..0000000
--- a/Tests/QtAutogenRerun/mocRerun.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-
-set(timeformat "%Y%j%H%M%S")
-set(mocRerunSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocRerun")
-set(mocRerunBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocRerun")
-
-# Initial build
-configure_file("${mocRerunSrcDir}/test1a.h.in" "${mocRerunBinDir}/test1.h" COPYONLY)
-try_compile(MOC_RERUN
-  "${mocRerunBinDir}"
-  "${mocRerunSrcDir}"
-  mocRerun
-  CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
-              "-DQT_TEST_VERSION=${QT_TEST_VERSION}"
-              "-DCMAKE_PREFIX_PATH=${Qt_PREFIX_DIR}"
-  OUTPUT_VARIABLE output
-)
-if (NOT MOC_RERUN)
-  message(SEND_ERROR "Initial build of mocRerun failed. Output: ${output}")
-endif()
-# Get name of the output binary
-file(STRINGS "${mocRerunBinDir}/mocRerun.txt" mocRerunList ENCODING UTF-8)
-list(GET mocRerunList 0 mocRerunBin)
-
-message("Changing the header content for a MOC rerun")
-# - Acquire binary timestamps before the build
-file(TIMESTAMP "${mocRerunBin}" timeBefore "${timeformat}")
-# - Ensure that the timestamp will change
-# - Change header file content and rebuild
-# - Rebuild
-execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-configure_file("${mocRerunSrcDir}/test1b.h.in" "${mocRerunBinDir}/test1.h" COPYONLY)
-execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocRerunBinDir}" RESULT_VARIABLE result )
-if (result)
-  message(SEND_ERROR "Second build of mocRerun failed.")
-endif()
-# - Acquire binary timestamps after the build
-file(TIMESTAMP "${mocRerunBin}" timeAfter "${timeformat}")
-# - Test if timestamps changed
-if (NOT timeAfter GREATER timeBefore)
-  message(SEND_ERROR "File (${mocRerunBin}) should have changed!")
-endif()
-
-
-message("Changing nothing for a MOC rerun")
-# - Acquire binary timestamps before the build
-file(TIMESTAMP "${mocRerunBin}" timeBefore "${timeformat}")
-# - Ensure that the timestamp would change
-# - Change nothing
-# - Rebuild
-execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
-execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocRerunBinDir}" RESULT_VARIABLE result )
-if (result)
-  message(SEND_ERROR "Third build of mocRerun failed.")
-endif()
-# - Acquire binary timestamps after the build
-file(TIMESTAMP "${mocRerunBin}" timeAfter "${timeformat}")
-# - Test if timestamps changed
-if (timeAfter GREATER timeBefore)
-  message(SEND_ERROR "File (${mocRerunBin}) should not have changed!")
-endif()
diff --git a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt b/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
deleted file mode 100644
index bafd9cf..0000000
--- a/Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-cmake_policy(SET CMP0071 NEW)
-project(mocRerun CXX)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-  set(QT_CORE_TARGET Qt4::QtCore)
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-
-  find_package(Qt5Core REQUIRED)
-  set(QT_CORE_TARGET Qt5::Core)
-endif()
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-# Generated source file
-add_custom_command(OUTPUT main.cpp
-  COMMAND ${CMAKE_COMMAND} -E sleep 2
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
-
-add_executable(mocRerun
-  ${CMAKE_CURRENT_BINARY_DIR}/test1.h
-  ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
-  res1.qrc)
-target_include_directories(mocRerun PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(mocRerun ${QT_CORE_TARGET})
-# Write target name to text file
-add_custom_command(TARGET mocRerun POST_BUILD COMMAND
-  ${CMAKE_COMMAND} -E echo "$<TARGET_FILE:mocRerun>" > mocRerun.txt)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4988746e76703269d76c3fb633bafc0767fafbe4
commit 4988746e76703269d76c3fb633bafc0767fafbe4
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 20:28:17 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate Complex test

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5608933..b0bf887 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1246,10 +1246,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   # the required dlls may not be in the PATH, so we can't run the executables
   # on that platform.
   if(WIN32)
-    set(run_autogen_test ${CMAKE_CTEST_COMMAND} -V)
     set(run_autouic_test ${CMAKE_CTEST_COMMAND} -V)
   else()
-    set(run_autogen_test complex/QtAutogen)
     set(run_autouic_test QtAutoUicInterface)
   endif()
   if(NOT CMAKE_CONFIGURATION_TYPES)
@@ -1265,22 +1263,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
     add_subdirectory(Qt5Autogen)
 
-    add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutogen"
-      "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
-      ${build_generator_args}
-      --build-project QtAutogen
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        -DQT_TEST_VERSION=5
-        ${QtAutogen_BUILD_OPTIONS}
-      --test-command ${run_autogen_test}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen")
-
     add_test(NAME Qt5AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun"
@@ -1313,22 +1295,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   if(QT4_WORKS AND QT_QTGUI_FOUND)
     add_subdirectory(Qt4Autogen)
 
-    add_test(NAME Qt4Autogen COMMAND ${CMAKE_CTEST_COMMAND}
-      --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/QtAutogen"
-      "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
-      ${build_generator_args}
-      --build-project QtAutogen
-      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
-      --force-new-ctest-process
-      --build-options ${build_options}
-        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-        -DQT_TEST_VERSION=4
-        ${QtAutogen_BUILD_OPTIONS}
-      --test-command ${run_autogen_test}
-      )
-    list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen")
-
     add_test(NAME Qt4AutogenRerun COMMAND ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutogenRerun"
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
deleted file mode 100644
index 833f64e..0000000
--- a/Tests/QtAutogen/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-cmake_policy(SET CMP0071 NEW)
-project(QtAutogen)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-
-  # Include this directory before using the UseQt4 file.
-  add_subdirectory(defines_test)
-
-  include(UseQt4)
-
-  set(QT_QTCORE_TARGET Qt4::QtCore)
-
-  macro(qtx_wrap_cpp)
-    qt4_wrap_cpp(${ARGN})
-  endmacro()
-  macro(qtx_generate_moc)
-    qt4_generate_moc(${ARGN})
-  endmacro()
-
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-  find_package(Qt5Widgets REQUIRED)
-
-  set(QT_QTCORE_TARGET Qt5::Core)
-
-  include_directories(${Qt5Widgets_INCLUDE_DIRS})
-  set(QT_LIBRARIES Qt5::Widgets)
-
-  if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
-    add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
-  endif()
-
-  macro(qtx_wrap_cpp)
-    qt5_wrap_cpp(${ARGN})
-  endmacro()
-  macro(qtx_generate_moc)
-    qt5_generate_moc(${ARGN})
-  endmacro()
-
-endif()
-
-get_property(QT_COMPILE_FEATURES TARGET ${QT_QTCORE_TARGET} PROPERTY INTERFACE_COMPILE_FEATURES)
-
-# Qt4 moc does not support utf8 paths in _parameter files generated by
-# qtx_wrap_cpp
-# https://bugreports.qt.io/browse/QTBUG-35480
-# Do a simple check if there is are non ASCII character in the build path
-string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR})
-if((NOT NON_ASCII_BDIR) OR (NOT QT_TEST_VERSION STREQUAL 4))
-  set(ALLOW_WRAP_CPP TRUE)
-endif()
-# On windows qtx_wrap_cpp also fails in Qt5 when used on a path that
-# contains non ASCII characters
-if(NON_ASCII_BDIR AND WIN32)
-  set(ALLOW_WRAP_CPP FALSE)
-endif()
-
-# -- Test
-# Complex test case
-add_subdirectory(complex)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 29bc4af..6921495 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -30,3 +30,4 @@ if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
 endif()
 ADD_AUTOGEN_TEST(SameName sameName)
 ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
+ADD_AUTOGEN_TEST(Complex QtAutogen)
diff --git a/Tests/QtAutogen/complex/Adir/CMakeLists.txt b/Tests/QtAutogen/Complex/Adir/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/complex/Adir/CMakeLists.txt
rename to Tests/QtAutogen/Complex/Adir/CMakeLists.txt
diff --git a/Tests/QtAutogen/complex/Adir/libA.cpp b/Tests/QtAutogen/Complex/Adir/libA.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/Adir/libA.cpp
rename to Tests/QtAutogen/Complex/Adir/libA.cpp
diff --git a/Tests/QtAutogen/complex/Adir/libA.h b/Tests/QtAutogen/Complex/Adir/libA.h
similarity index 100%
rename from Tests/QtAutogen/complex/Adir/libA.h
rename to Tests/QtAutogen/Complex/Adir/libA.h
diff --git a/Tests/QtAutogen/complex/Bdir/CMakeLists.txt b/Tests/QtAutogen/Complex/Bdir/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/complex/Bdir/CMakeLists.txt
rename to Tests/QtAutogen/Complex/Bdir/CMakeLists.txt
diff --git a/Tests/QtAutogen/complex/Bdir/libB.cpp b/Tests/QtAutogen/Complex/Bdir/libB.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/Bdir/libB.cpp
rename to Tests/QtAutogen/Complex/Bdir/libB.cpp
diff --git a/Tests/QtAutogen/complex/Bdir/libB.h b/Tests/QtAutogen/Complex/Bdir/libB.h
similarity index 100%
rename from Tests/QtAutogen/complex/Bdir/libB.h
rename to Tests/QtAutogen/Complex/Bdir/libB.h
diff --git a/Tests/QtAutogen/complex/CMakeLists.txt b/Tests/QtAutogen/Complex/CMakeLists.txt
similarity index 97%
rename from Tests/QtAutogen/complex/CMakeLists.txt
rename to Tests/QtAutogen/Complex/CMakeLists.txt
index 2043ccf..e9feea0 100644
--- a/Tests/QtAutogen/complex/CMakeLists.txt
+++ b/Tests/QtAutogen/Complex/CMakeLists.txt
@@ -1,4 +1,6 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
+project(Complex)
+include("../AutogenTest.cmake")
 
 # -- Test: AUTOMOC AUTORCC AUTOUIC
 add_definitions(-DFOO -DSomeDefine="Barx")
@@ -20,7 +22,7 @@ add_custom_command(
   OUTPUT generated.txt
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/generated.txt.in" "${CMAKE_CURRENT_BINARY_DIR}/generated.txt"
   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/generated.txt.in"
-  )
+)
 
 add_custom_target(generate_moc_input
   DEPENDS generated.txt
diff --git a/Tests/QtAutogen/complex/abc.cpp b/Tests/QtAutogen/Complex/abc.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/abc.cpp
rename to Tests/QtAutogen/Complex/abc.cpp
diff --git a/Tests/QtAutogen/complex/abc.h b/Tests/QtAutogen/Complex/abc.h
similarity index 100%
rename from Tests/QtAutogen/complex/abc.h
rename to Tests/QtAutogen/Complex/abc.h
diff --git a/Tests/QtAutogen/complex/abc_p.h b/Tests/QtAutogen/Complex/abc_p.h
similarity index 100%
rename from Tests/QtAutogen/complex/abc_p.h
rename to Tests/QtAutogen/Complex/abc_p.h
diff --git a/Tests/QtAutogen/complex/bar.cpp b/Tests/QtAutogen/Complex/bar.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/bar.cpp
rename to Tests/QtAutogen/Complex/bar.cpp
diff --git a/Tests/QtAutogen/complex/blub.cpp b/Tests/QtAutogen/Complex/blub.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/blub.cpp
rename to Tests/QtAutogen/Complex/blub.cpp
diff --git a/Tests/QtAutogen/complex/blub.h b/Tests/QtAutogen/Complex/blub.h
similarity index 100%
rename from Tests/QtAutogen/complex/blub.h
rename to Tests/QtAutogen/Complex/blub.h
diff --git a/Tests/QtAutogen/complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/calwidget.cpp
rename to Tests/QtAutogen/Complex/calwidget.cpp
diff --git a/Tests/QtAutogen/complex/calwidget.h b/Tests/QtAutogen/Complex/calwidget.h
similarity index 100%
rename from Tests/QtAutogen/complex/calwidget.h
rename to Tests/QtAutogen/Complex/calwidget.h
diff --git a/Tests/QtAutogen/complex/calwidget.ui b/Tests/QtAutogen/Complex/calwidget.ui
similarity index 100%
rename from Tests/QtAutogen/complex/calwidget.ui
rename to Tests/QtAutogen/Complex/calwidget.ui
diff --git a/Tests/QtAutogen/complex/codeeditor.cpp b/Tests/QtAutogen/Complex/codeeditor.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/codeeditor.cpp
rename to Tests/QtAutogen/Complex/codeeditor.cpp
diff --git a/Tests/QtAutogen/complex/codeeditor.h b/Tests/QtAutogen/Complex/codeeditor.h
similarity index 100%
rename from Tests/QtAutogen/complex/codeeditor.h
rename to Tests/QtAutogen/Complex/codeeditor.h
diff --git a/Tests/QtAutogen/complex/debug_class.cpp b/Tests/QtAutogen/Complex/debug_class.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/debug_class.cpp
rename to Tests/QtAutogen/Complex/debug_class.cpp
diff --git a/Tests/QtAutogen/complex/debug_class.h b/Tests/QtAutogen/Complex/debug_class.h
similarity index 100%
rename from Tests/QtAutogen/complex/debug_class.h
rename to Tests/QtAutogen/Complex/debug_class.h
diff --git a/Tests/QtAutogen/complex/debug_class.ui b/Tests/QtAutogen/Complex/debug_class.ui
similarity index 100%
rename from Tests/QtAutogen/complex/debug_class.ui
rename to Tests/QtAutogen/Complex/debug_class.ui
diff --git a/Tests/QtAutogen/complex/debug_resource.qrc b/Tests/QtAutogen/Complex/debug_resource.qrc
similarity index 100%
rename from Tests/QtAutogen/complex/debug_resource.qrc
rename to Tests/QtAutogen/Complex/debug_resource.qrc
diff --git a/Tests/QtAutogen/complex/foo.cpp b/Tests/QtAutogen/Complex/foo.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/foo.cpp
rename to Tests/QtAutogen/Complex/foo.cpp
diff --git a/Tests/QtAutogen/complex/foo.h b/Tests/QtAutogen/Complex/foo.h
similarity index 100%
rename from Tests/QtAutogen/complex/foo.h
rename to Tests/QtAutogen/Complex/foo.h
diff --git a/Tests/QtAutogen/complex/gadget.cpp b/Tests/QtAutogen/Complex/gadget.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/gadget.cpp
rename to Tests/QtAutogen/Complex/gadget.cpp
diff --git a/Tests/QtAutogen/complex/gadget.h b/Tests/QtAutogen/Complex/gadget.h
similarity index 100%
rename from Tests/QtAutogen/complex/gadget.h
rename to Tests/QtAutogen/Complex/gadget.h
diff --git a/Tests/QtAutogen/complex/generated.cpp b/Tests/QtAutogen/Complex/generated.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/generated.cpp
rename to Tests/QtAutogen/Complex/generated.cpp
diff --git a/Tests/QtAutogen/complex/generated.h b/Tests/QtAutogen/Complex/generated.h
similarity index 100%
rename from Tests/QtAutogen/complex/generated.h
rename to Tests/QtAutogen/Complex/generated.h
diff --git a/Tests/QtAutogen/complex/generated.txt.in b/Tests/QtAutogen/Complex/generated.txt.in
similarity index 100%
rename from Tests/QtAutogen/complex/generated.txt.in
rename to Tests/QtAutogen/Complex/generated.txt.in
diff --git a/Tests/QtAutogen/complex/generated_resource.qrc.in b/Tests/QtAutogen/Complex/generated_resource.qrc.in
similarity index 100%
rename from Tests/QtAutogen/complex/generated_resource.qrc.in
rename to Tests/QtAutogen/Complex/generated_resource.qrc.in
diff --git a/Tests/QtAutogen/complex/libC.cpp b/Tests/QtAutogen/Complex/libC.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/libC.cpp
rename to Tests/QtAutogen/Complex/libC.cpp
diff --git a/Tests/QtAutogen/complex/libC.h b/Tests/QtAutogen/Complex/libC.h
similarity index 100%
rename from Tests/QtAutogen/complex/libC.h
rename to Tests/QtAutogen/Complex/libC.h
diff --git a/Tests/QtAutogen/complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/main.cpp
rename to Tests/QtAutogen/Complex/main.cpp
diff --git a/Tests/QtAutogen/complex/multiplewidgets.cpp b/Tests/QtAutogen/Complex/multiplewidgets.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/multiplewidgets.cpp
rename to Tests/QtAutogen/Complex/multiplewidgets.cpp
diff --git a/Tests/QtAutogen/complex/multiplewidgets.h b/Tests/QtAutogen/Complex/multiplewidgets.h
similarity index 100%
rename from Tests/QtAutogen/complex/multiplewidgets.h
rename to Tests/QtAutogen/Complex/multiplewidgets.h
diff --git a/Tests/QtAutogen/complex/myinterface.h.in b/Tests/QtAutogen/Complex/myinterface.h.in
similarity index 100%
rename from Tests/QtAutogen/complex/myinterface.h.in
rename to Tests/QtAutogen/Complex/myinterface.h.in
diff --git a/Tests/QtAutogen/complex/myotherinterface.h.in b/Tests/QtAutogen/Complex/myotherinterface.h.in
similarity index 100%
rename from Tests/QtAutogen/complex/myotherinterface.h.in
rename to Tests/QtAutogen/Complex/myotherinterface.h.in
diff --git a/Tests/QtAutogen/complex/private_slot.cpp b/Tests/QtAutogen/Complex/private_slot.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/private_slot.cpp
rename to Tests/QtAutogen/Complex/private_slot.cpp
diff --git a/Tests/QtAutogen/complex/private_slot.h b/Tests/QtAutogen/Complex/private_slot.h
similarity index 100%
rename from Tests/QtAutogen/complex/private_slot.h
rename to Tests/QtAutogen/Complex/private_slot.h
diff --git a/Tests/QtAutogen/complex/resourcetester.cpp b/Tests/QtAutogen/Complex/resourcetester.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/resourcetester.cpp
rename to Tests/QtAutogen/Complex/resourcetester.cpp
diff --git a/Tests/QtAutogen/complex/resourcetester.h b/Tests/QtAutogen/Complex/resourcetester.h
similarity index 100%
rename from Tests/QtAutogen/complex/resourcetester.h
rename to Tests/QtAutogen/Complex/resourcetester.h
diff --git a/Tests/QtAutogen/complex/second_resource.qrc b/Tests/QtAutogen/Complex/second_resource.qrc
similarity index 100%
rename from Tests/QtAutogen/complex/second_resource.qrc
rename to Tests/QtAutogen/Complex/second_resource.qrc
diff --git a/Tests/QtAutogen/complex/second_widget.cpp b/Tests/QtAutogen/Complex/second_widget.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/second_widget.cpp
rename to Tests/QtAutogen/Complex/second_widget.cpp
diff --git a/Tests/QtAutogen/complex/second_widget.h b/Tests/QtAutogen/Complex/second_widget.h
similarity index 100%
rename from Tests/QtAutogen/complex/second_widget.h
rename to Tests/QtAutogen/Complex/second_widget.h
diff --git a/Tests/QtAutogen/complex/second_widget.ui b/Tests/QtAutogen/Complex/second_widget.ui
similarity index 100%
rename from Tests/QtAutogen/complex/second_widget.ui
rename to Tests/QtAutogen/Complex/second_widget.ui
diff --git a/Tests/QtAutogen/complex/sub/bar.h b/Tests/QtAutogen/Complex/sub/bar.h
similarity index 100%
rename from Tests/QtAutogen/complex/sub/bar.h
rename to Tests/QtAutogen/Complex/sub/bar.h
diff --git a/Tests/QtAutogen/complex/targetObjectsTest.cpp b/Tests/QtAutogen/Complex/targetObjectsTest.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/targetObjectsTest.cpp
rename to Tests/QtAutogen/Complex/targetObjectsTest.cpp
diff --git a/Tests/QtAutogen/complex/test.qrc b/Tests/QtAutogen/Complex/test.qrc
similarity index 100%
rename from Tests/QtAutogen/complex/test.qrc
rename to Tests/QtAutogen/Complex/test.qrc
diff --git a/Tests/QtAutogen/complex/widget1.ui b/Tests/QtAutogen/Complex/widget1.ui
similarity index 100%
rename from Tests/QtAutogen/complex/widget1.ui
rename to Tests/QtAutogen/Complex/widget1.ui
diff --git a/Tests/QtAutogen/complex/widget2.ui b/Tests/QtAutogen/Complex/widget2.ui
similarity index 100%
rename from Tests/QtAutogen/complex/widget2.ui
rename to Tests/QtAutogen/Complex/widget2.ui
diff --git a/Tests/QtAutogen/complex/xyz.cpp b/Tests/QtAutogen/Complex/xyz.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/xyz.cpp
rename to Tests/QtAutogen/Complex/xyz.cpp
diff --git a/Tests/QtAutogen/complex/xyz.h b/Tests/QtAutogen/Complex/xyz.h
similarity index 100%
rename from Tests/QtAutogen/complex/xyz.h
rename to Tests/QtAutogen/Complex/xyz.h
diff --git a/Tests/QtAutogen/complex/yaf.cpp b/Tests/QtAutogen/Complex/yaf.cpp
similarity index 100%
rename from Tests/QtAutogen/complex/yaf.cpp
rename to Tests/QtAutogen/Complex/yaf.cpp
diff --git a/Tests/QtAutogen/complex/yaf.h b/Tests/QtAutogen/Complex/yaf.h
similarity index 100%
rename from Tests/QtAutogen/complex/yaf.h
rename to Tests/QtAutogen/Complex/yaf.h
diff --git a/Tests/QtAutogen/complex/yaf_p.h b/Tests/QtAutogen/Complex/yaf_p.h
similarity index 100%
rename from Tests/QtAutogen/complex/yaf_p.h
rename to Tests/QtAutogen/Complex/yaf_p.h
diff --git a/Tests/QtAutogen/defines_test/CMakeLists.txt b/Tests/QtAutogen/defines_test/CMakeLists.txt
deleted file mode 100644
index 9ee9a22..0000000
--- a/Tests/QtAutogen/defines_test/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-add_executable(defines_test defines_test.cpp)
-set_target_properties(defines_test PROPERTIES AUTOMOC TRUE)
-target_link_libraries(defines_test Qt4::QtGui)
diff --git a/Tests/QtAutogen/defines_test/defines_test.cpp b/Tests/QtAutogen/defines_test/defines_test.cpp
deleted file mode 100644
index cf4e9cb..0000000
--- a/Tests/QtAutogen/defines_test/defines_test.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#include <QObject>
-
-#ifdef QT_GUI_LIB
-#include <QTextDocument>
-
-class SomeDocument : public QTextDocument
-{
-  Q_OBJECT
-
-Q_SIGNALS:
-  void someSig();
-};
-#endif
-
-#ifdef QT_CORE_LIB
-class SomeObject : public QObject
-{
-  Q_OBJECT
-
-Q_SIGNALS:
-  void someSig();
-};
-#endif
-
-int main(int argc, char** argv)
-{
-#ifdef QT_CORE_LIB
-  QMetaObject sosmo = SomeObject::staticMetaObject;
-#endif
-#ifdef QT_GUI_LIB
-  QMetaObject sdsmo = SomeDocument::staticMetaObject;
-#endif
-
-  return 0;
-}
-
-#include "defines_test.moc"

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ce6fd426ee7649a40c2f253dbc5f814650f0992
commit 6ce6fd426ee7649a40c2f253dbc5f814650f0992
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 20:22:27 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate StaticLibraryCycle test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 47164d2..833f64e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,9 +60,5 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Tests static library cycles
-add_subdirectory(staticLibraryCycle)
-
-# -- Test
 # Complex test case
 add_subdirectory(complex)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 7f72386..29bc4af 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -29,3 +29,4 @@ if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
 endif()
 ADD_AUTOGEN_TEST(SameName sameName)
+ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
diff --git a/Tests/QtAutogen/staticLibraryCycle/CMakeLists.txt b/Tests/QtAutogen/StaticLibraryCycle/CMakeLists.txt
similarity index 73%
rename from Tests/QtAutogen/staticLibraryCycle/CMakeLists.txt
rename to Tests/QtAutogen/StaticLibraryCycle/CMakeLists.txt
index 144a435..0c2f987 100644
--- a/Tests/QtAutogen/staticLibraryCycle/CMakeLists.txt
+++ b/Tests/QtAutogen/StaticLibraryCycle/CMakeLists.txt
@@ -1,5 +1,8 @@
-# Test AUTOMOC and AUTORCC on source files with the same name
-# but in different subdirectories
+cmake_minimum_required(VERSION 3.10)
+project(StaticLibraryCycle)
+include("../AutogenTest.cmake")
+
+# Test AUTOMOC on cyclic static libraries
 
 set(CMAKE_AUTOMOC ON)
 
diff --git a/Tests/QtAutogen/StaticLibraryCycle/a.cpp b/Tests/QtAutogen/StaticLibraryCycle/a.cpp
new file mode 100644
index 0000000..faa52e6
--- /dev/null
+++ b/Tests/QtAutogen/StaticLibraryCycle/a.cpp
@@ -0,0 +1,12 @@
+#include "a.h"
+#include "b.h"
+
+bool A::recursed = false;
+
+A::A()
+{
+  if (!A::recursed) {
+    A::recursed = true;
+    B b;
+  }
+}
diff --git a/Tests/QtAutogen/staticLibraryCycle/a.h b/Tests/QtAutogen/StaticLibraryCycle/a.h
similarity index 83%
rename from Tests/QtAutogen/staticLibraryCycle/a.h
rename to Tests/QtAutogen/StaticLibraryCycle/a.h
index 7176170..f24398e 100644
--- a/Tests/QtAutogen/staticLibraryCycle/a.h
+++ b/Tests/QtAutogen/StaticLibraryCycle/a.h
@@ -6,6 +6,8 @@
 class A : public QObject
 {
   Q_OBJECT
+  static bool recursed;
+
 public:
   A();
 };
diff --git a/Tests/QtAutogen/staticLibraryCycle/b.cpp b/Tests/QtAutogen/StaticLibraryCycle/b.cpp
similarity index 100%
rename from Tests/QtAutogen/staticLibraryCycle/b.cpp
rename to Tests/QtAutogen/StaticLibraryCycle/b.cpp
diff --git a/Tests/QtAutogen/staticLibraryCycle/b.h b/Tests/QtAutogen/StaticLibraryCycle/b.h
similarity index 100%
rename from Tests/QtAutogen/staticLibraryCycle/b.h
rename to Tests/QtAutogen/StaticLibraryCycle/b.h
diff --git a/Tests/QtAutogen/staticLibraryCycle/c.cpp b/Tests/QtAutogen/StaticLibraryCycle/c.cpp
similarity index 100%
rename from Tests/QtAutogen/staticLibraryCycle/c.cpp
rename to Tests/QtAutogen/StaticLibraryCycle/c.cpp
diff --git a/Tests/QtAutogen/staticLibraryCycle/c.h b/Tests/QtAutogen/StaticLibraryCycle/c.h
similarity index 100%
rename from Tests/QtAutogen/staticLibraryCycle/c.h
rename to Tests/QtAutogen/StaticLibraryCycle/c.h
diff --git a/Tests/QtAutogen/staticLibraryCycle/main.cpp b/Tests/QtAutogen/StaticLibraryCycle/main.cpp
similarity index 100%
rename from Tests/QtAutogen/staticLibraryCycle/main.cpp
rename to Tests/QtAutogen/StaticLibraryCycle/main.cpp
diff --git a/Tests/QtAutogen/staticLibraryCycle/a.cpp b/Tests/QtAutogen/staticLibraryCycle/a.cpp
deleted file mode 100644
index 97cc66e..0000000
--- a/Tests/QtAutogen/staticLibraryCycle/a.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "a.h"
-#include "b.h"
-
-A::A()
-{
-  B b;
-}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45b6776ab301f4b5ec51e27863ffe061b1a0d60a
commit 45b6776ab301f4b5ec51e27863ffe061b1a0d60a
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 20:12:30 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate SameName test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index d13c826..47164d2 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Source files with the same basename in different subdirectories
-add_subdirectory(sameName)
-
-# -- Test
 # Tests static library cycles
 add_subdirectory(staticLibraryCycle)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 1e2894e..7f72386 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -28,3 +28,4 @@ ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
 endif()
+ADD_AUTOGEN_TEST(SameName sameName)
diff --git a/Tests/QtAutogen/sameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt
similarity index 89%
rename from Tests/QtAutogen/sameName/CMakeLists.txt
rename to Tests/QtAutogen/SameName/CMakeLists.txt
index f695875..c7d6e52 100644
--- a/Tests/QtAutogen/sameName/CMakeLists.txt
+++ b/Tests/QtAutogen/SameName/CMakeLists.txt
@@ -1,3 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(SameName)
+include("../AutogenTest.cmake")
+
 # Test AUTOMOC and AUTORCC on source files with the same name
 # but in different subdirectories
 
@@ -20,7 +24,8 @@ target_link_libraries(sameName ${QT_LIBRARIES})
 set_target_properties(sameName PROPERTIES
   AUTOMOC TRUE
   AUTOUIC TRUE
-  AUTORCC TRUE)
+  AUTORCC TRUE
+)
 
 # Set different compression levels
 if (QT_TEST_VERSION STREQUAL 4)
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc b/Tests/QtAutogen/SameName/aaa/bbb/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/bbb/data.qrc
rename to Tests/QtAutogen/SameName/aaa/bbb/data.qrc
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp b/Tests/QtAutogen/SameName/aaa/bbb/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/bbb/item.cpp
rename to Tests/QtAutogen/SameName/aaa/bbb/item.cpp
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp b/Tests/QtAutogen/SameName/aaa/bbb/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/bbb/item.hpp
rename to Tests/QtAutogen/SameName/aaa/bbb/item.hpp
diff --git a/Tests/QtAutogen/sameName/aaa/data.qrc b/Tests/QtAutogen/SameName/aaa/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/data.qrc
rename to Tests/QtAutogen/SameName/aaa/data.qrc
diff --git a/Tests/QtAutogen/sameName/aaa/item.cpp b/Tests/QtAutogen/SameName/aaa/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/item.cpp
rename to Tests/QtAutogen/SameName/aaa/item.cpp
diff --git a/Tests/QtAutogen/sameName/aaa/item.hpp b/Tests/QtAutogen/SameName/aaa/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/item.hpp
rename to Tests/QtAutogen/SameName/aaa/item.hpp
diff --git a/Tests/QtAutogen/sameName/aaa/view.ui b/Tests/QtAutogen/SameName/aaa/view.ui
similarity index 100%
rename from Tests/QtAutogen/sameName/aaa/view.ui
rename to Tests/QtAutogen/SameName/aaa/view.ui
diff --git a/Tests/QtAutogen/sameName/bbb/aaa/data.qrc b/Tests/QtAutogen/SameName/bbb/aaa/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/aaa/data.qrc
rename to Tests/QtAutogen/SameName/bbb/aaa/data.qrc
diff --git a/Tests/QtAutogen/sameName/bbb/aaa/item.cpp b/Tests/QtAutogen/SameName/bbb/aaa/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/aaa/item.cpp
rename to Tests/QtAutogen/SameName/bbb/aaa/item.cpp
diff --git a/Tests/QtAutogen/sameName/bbb/aaa/item.hpp b/Tests/QtAutogen/SameName/bbb/aaa/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/aaa/item.hpp
rename to Tests/QtAutogen/SameName/bbb/aaa/item.hpp
diff --git a/Tests/QtAutogen/sameName/bbb/data.qrc b/Tests/QtAutogen/SameName/bbb/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/data.qrc
rename to Tests/QtAutogen/SameName/bbb/data.qrc
diff --git a/Tests/QtAutogen/sameName/bbb/item.cpp b/Tests/QtAutogen/SameName/bbb/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/item.cpp
rename to Tests/QtAutogen/SameName/bbb/item.cpp
diff --git a/Tests/QtAutogen/sameName/bbb/item.hpp b/Tests/QtAutogen/SameName/bbb/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/item.hpp
rename to Tests/QtAutogen/SameName/bbb/item.hpp
diff --git a/Tests/QtAutogen/sameName/bbb/view.ui b/Tests/QtAutogen/SameName/bbb/view.ui
similarity index 100%
rename from Tests/QtAutogen/sameName/bbb/view.ui
rename to Tests/QtAutogen/SameName/bbb/view.ui
diff --git a/Tests/QtAutogen/sameName/ccc/data.qrc b/Tests/QtAutogen/SameName/ccc/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/ccc/data.qrc
rename to Tests/QtAutogen/SameName/ccc/data.qrc
diff --git a/Tests/QtAutogen/sameName/ccc/item.cpp b/Tests/QtAutogen/SameName/ccc/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/ccc/item.cpp
rename to Tests/QtAutogen/SameName/ccc/item.cpp
diff --git a/Tests/QtAutogen/sameName/ccc/item.hpp b/Tests/QtAutogen/SameName/ccc/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/ccc/item.hpp
rename to Tests/QtAutogen/SameName/ccc/item.hpp
diff --git a/Tests/QtAutogen/sameName/ccc/view.ui b/Tests/QtAutogen/SameName/ccc/view.ui
similarity index 100%
rename from Tests/QtAutogen/sameName/ccc/view.ui
rename to Tests/QtAutogen/SameName/ccc/view.ui
diff --git a/Tests/QtAutogen/sameName/data.qrc b/Tests/QtAutogen/SameName/data.qrc
similarity index 100%
rename from Tests/QtAutogen/sameName/data.qrc
rename to Tests/QtAutogen/SameName/data.qrc
diff --git a/Tests/QtAutogen/sameName/item.cpp b/Tests/QtAutogen/SameName/item.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/item.cpp
rename to Tests/QtAutogen/SameName/item.cpp
diff --git a/Tests/QtAutogen/sameName/item.hpp b/Tests/QtAutogen/SameName/item.hpp
similarity index 100%
rename from Tests/QtAutogen/sameName/item.hpp
rename to Tests/QtAutogen/SameName/item.hpp
diff --git a/Tests/QtAutogen/sameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp
similarity index 100%
rename from Tests/QtAutogen/sameName/main.cpp
rename to Tests/QtAutogen/SameName/main.cpp
diff --git a/Tests/QtAutogen/sameName/view.ui b/Tests/QtAutogen/SameName/view.ui
similarity index 100%
rename from Tests/QtAutogen/sameName/view.ui
rename to Tests/QtAutogen/SameName/view.ui

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7868687c814cded6319dd0cfd9fff5c737bf0f0
commit d7868687c814cded6319dd0cfd9fff5c737bf0f0
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 20:07:55 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate MacOsFW test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 8fb9ab3..d13c826 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,12 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# MacOS Framework
-if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
-  add_subdirectory(macosFW)
-endif()
-
-# -- Test
 # Source files with the same basename in different subdirectories
 add_subdirectory(sameName)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 9e49153..1e2894e 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -25,3 +25,6 @@ if(QT_TEST_ALLOW_QT_MACROS)
 endif()
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
 ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
+if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
+  ADD_AUTOGEN_TEST(MacOsFW)
+endif()
diff --git a/Tests/QtAutogen/macosFW/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
similarity index 85%
rename from Tests/QtAutogen/macosFW/CMakeLists.txt
rename to Tests/QtAutogen/MacOsFW/CMakeLists.txt
index 114d9ba..26d2019 100644
--- a/Tests/QtAutogen/macosFW/CMakeLists.txt
+++ b/Tests/QtAutogen/MacOsFW/CMakeLists.txt
@@ -1,5 +1,6 @@
-cmake_minimum_required(VERSION 3.8)
-project(macos-fw-test)
+cmake_minimum_required(VERSION 3.10)
+project(MacOsFW)
+include("../AutogenTest.cmake")
 
 find_package(Qt5Test REQUIRED)
 
diff --git a/Tests/QtAutogen/macosFW/src/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/src/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/macosFW/src/CMakeLists.txt
rename to Tests/QtAutogen/MacOsFW/src/CMakeLists.txt
diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp
similarity index 100%
rename from Tests/QtAutogen/macosFW/src/macos_fw_lib.cpp
rename to Tests/QtAutogen/MacOsFW/src/macos_fw_lib.cpp
diff --git a/Tests/QtAutogen/macosFW/src/macos_fw_lib.h b/Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h
similarity index 100%
rename from Tests/QtAutogen/macosFW/src/macos_fw_lib.h
rename to Tests/QtAutogen/MacOsFW/src/macos_fw_lib.h
diff --git a/Tests/QtAutogen/macosFW/test/CMakeLists.txt b/Tests/QtAutogen/MacOsFW/test/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/macosFW/test/CMakeLists.txt
rename to Tests/QtAutogen/MacOsFW/test/CMakeLists.txt
diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp
similarity index 100%
rename from Tests/QtAutogen/macosFW/test/testMacosFWLib.cpp
rename to Tests/QtAutogen/MacOsFW/test/testMacosFWLib.cpp
diff --git a/Tests/QtAutogen/macosFW/test/testMacosFWLib.h b/Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h
similarity index 100%
rename from Tests/QtAutogen/macosFW/test/testMacosFWLib.h
rename to Tests/QtAutogen/MacOsFW/test/testMacosFWLib.h

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ef28ae1f442144f55e23b8defffe01aa350c44
commit b8ef28ae1f442144f55e23b8defffe01aa350c44
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 20:01:48 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate ObjectLibrary test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 288ae60..8fb9ab3 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# OBJECT libraries
-add_subdirectory(objectLibrary)
-
-# -- Test
 # MacOS Framework
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   add_subdirectory(macosFW)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index e873d06..9e49153 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -24,3 +24,4 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocCMP0071)
 endif()
 ADD_AUTOGEN_TEST(UicInclude uicInclude)
+ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
diff --git a/Tests/QtAutogen/objectLibrary/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
similarity index 83%
rename from Tests/QtAutogen/objectLibrary/CMakeLists.txt
rename to Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
index 9b29a40..088a24c 100644
--- a/Tests/QtAutogen/objectLibrary/CMakeLists.txt
+++ b/Tests/QtAutogen/ObjectLibrary/CMakeLists.txt
@@ -1,3 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(ObjectLibrary)
+include("../AutogenTest.cmake")
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
diff --git a/Tests/QtAutogen/objectLibrary/a/CMakeLists.txt b/Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/CMakeLists.txt
rename to Tests/QtAutogen/ObjectLibrary/a/CMakeLists.txt
diff --git a/Tests/QtAutogen/objectLibrary/a/classa.cpp b/Tests/QtAutogen/ObjectLibrary/a/classa.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/classa.cpp
rename to Tests/QtAutogen/ObjectLibrary/a/classa.cpp
diff --git a/Tests/QtAutogen/objectLibrary/a/classa.h b/Tests/QtAutogen/ObjectLibrary/a/classa.h
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/a/classa.h
rename to Tests/QtAutogen/ObjectLibrary/a/classa.h
diff --git a/Tests/QtAutogen/objectLibrary/b/classb.cpp b/Tests/QtAutogen/ObjectLibrary/b/classb.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/b/classb.cpp
rename to Tests/QtAutogen/ObjectLibrary/b/classb.cpp
diff --git a/Tests/QtAutogen/objectLibrary/b/classb.h b/Tests/QtAutogen/ObjectLibrary/b/classb.h
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/b/classb.h
rename to Tests/QtAutogen/ObjectLibrary/b/classb.h
diff --git a/Tests/QtAutogen/objectLibrary/main.cpp b/Tests/QtAutogen/ObjectLibrary/main.cpp
similarity index 100%
rename from Tests/QtAutogen/objectLibrary/main.cpp
rename to Tests/QtAutogen/ObjectLibrary/main.cpp

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b6ad59ea6b74379f4aefb42c2402355c393c656
commit 0b6ad59ea6b74379f4aefb42c2402355c393c656
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 19:56:26 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:18 2017 +0100

    Autogen: Tests: Separate UicInclude test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 1f50931..288ae60 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Tests various .ui include directories
-add_subdirectory(uicInclude)
-
-# -- Test
 # OBJECT libraries
 add_subdirectory(objectLibrary)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 932169b..e873d06 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -23,3 +23,4 @@ endif()
 if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocCMP0071)
 endif()
+ADD_AUTOGEN_TEST(UicInclude uicInclude)
diff --git a/Tests/QtAutogen/uicInclude/CMakeLists.txt b/Tests/QtAutogen/UicInclude/CMakeLists.txt
similarity index 68%
rename from Tests/QtAutogen/uicInclude/CMakeLists.txt
rename to Tests/QtAutogen/UicInclude/CMakeLists.txt
index f62ebb0..56f76fb 100644
--- a/Tests/QtAutogen/uicInclude/CMakeLists.txt
+++ b/Tests/QtAutogen/UicInclude/CMakeLists.txt
@@ -1,5 +1,8 @@
-# Test moc include patterns
+cmake_minimum_required(VERSION 3.10)
+project(UicInclude)
+include("../AutogenTest.cmake")
 
+# Test uic include patterns
 set(CMAKE_AUTOUIC_SEARCH_PATHS "dirA")
 
 add_executable(uicInclude main.cpp)
diff --git a/Tests/QtAutogen/uicInclude/PageC.ui b/Tests/QtAutogen/UicInclude/PageC.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/PageC.ui
rename to Tests/QtAutogen/UicInclude/PageC.ui
diff --git a/Tests/QtAutogen/uicInclude/PageC2.ui b/Tests/QtAutogen/UicInclude/PageC2.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/PageC2.ui
rename to Tests/QtAutogen/UicInclude/PageC2.ui
diff --git a/Tests/QtAutogen/uicInclude/dirA/PageA.ui b/Tests/QtAutogen/UicInclude/dirA/PageA.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/dirA/PageA.ui
rename to Tests/QtAutogen/UicInclude/dirA/PageA.ui
diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB.ui b/Tests/QtAutogen/UicInclude/dirB/PageB.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/dirB/PageB.ui
rename to Tests/QtAutogen/UicInclude/dirB/PageB.ui
diff --git a/Tests/QtAutogen/uicInclude/dirB/PageB2.ui b/Tests/QtAutogen/UicInclude/dirB/PageB2.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/dirB/PageB2.ui
rename to Tests/QtAutogen/UicInclude/dirB/PageB2.ui
diff --git a/Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui b/Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/dirB/subB/PageBsub.ui
rename to Tests/QtAutogen/UicInclude/dirB/subB/PageBsub.ui
diff --git a/Tests/QtAutogen/uicInclude/main.cpp b/Tests/QtAutogen/UicInclude/main.cpp
similarity index 100%
rename from Tests/QtAutogen/uicInclude/main.cpp
rename to Tests/QtAutogen/UicInclude/main.cpp
diff --git a/Tests/QtAutogen/uicInclude/main.hpp b/Tests/QtAutogen/UicInclude/main.hpp
similarity index 100%
rename from Tests/QtAutogen/uicInclude/main.hpp
rename to Tests/QtAutogen/UicInclude/main.hpp
diff --git a/Tests/QtAutogen/uicInclude/subC/PageCsub.ui b/Tests/QtAutogen/UicInclude/subC/PageCsub.ui
similarity index 100%
rename from Tests/QtAutogen/uicInclude/subC/PageCsub.ui
rename to Tests/QtAutogen/UicInclude/subC/PageCsub.ui

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2
commit a2c4e3489d9ccd7150b6fda2ea7254c21dcde1b2
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 19:49:32 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:17 2017 +0100

    Autogen: Tests: Separate MocCMP0071 test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 5775117..1f50931 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,12 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Tests policy 0071
-if(ALLOW_WRAP_CPP)
-  add_subdirectory(mocCMP0071)
-endif()
-
-# -- Test
 # Tests various .ui include directories
 add_subdirectory(uicInclude)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 4d89eae..932169b 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -20,3 +20,6 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocIncludeStrict mocIncludeStrict)
   ADD_AUTOGEN_TEST(MocIncludeRelaxed mocIncludeRelaxed)
 endif()
+if(QT_TEST_ALLOW_QT_MACROS)
+  ADD_AUTOGEN_TEST(MocCMP0071)
+endif()
diff --git a/Tests/QtAutogen/MocCMP0071/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/CMakeLists.txt
new file mode 100644
index 0000000..a79f36e
--- /dev/null
+++ b/Tests/QtAutogen/MocCMP0071/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocCMP0071)
+include("../AutogenTest.cmake")
+
+add_subdirectory(OLD)
+add_subdirectory(NEW)
diff --git a/Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt
similarity index 94%
rename from Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt
rename to Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt
index 0237afc..954fe3d 100644
--- a/Tests/QtAutogen/mocCMP0071/NEW/CMakeLists.txt
+++ b/Tests/QtAutogen/MocCMP0071/NEW/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0071 NEW)
 
 # *Generate* files
diff --git a/Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt b/Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt
similarity index 95%
rename from Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt
rename to Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt
index 5699433..68fa067 100644
--- a/Tests/QtAutogen/mocCMP0071/OLD/CMakeLists.txt
+++ b/Tests/QtAutogen/MocCMP0071/OLD/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0071 OLD)
 
 # *Generate* files
diff --git a/Tests/QtAutogen/mocCMP0071/Obj.cpp b/Tests/QtAutogen/MocCMP0071/Obj.cpp
similarity index 100%
rename from Tests/QtAutogen/mocCMP0071/Obj.cpp
rename to Tests/QtAutogen/MocCMP0071/Obj.cpp
diff --git a/Tests/QtAutogen/mocCMP0071/Obj.hpp b/Tests/QtAutogen/MocCMP0071/Obj.hpp
similarity index 100%
rename from Tests/QtAutogen/mocCMP0071/Obj.hpp
rename to Tests/QtAutogen/MocCMP0071/Obj.hpp
diff --git a/Tests/QtAutogen/mocCMP0071/Obj_p.h b/Tests/QtAutogen/MocCMP0071/Obj_p.h
similarity index 100%
rename from Tests/QtAutogen/mocCMP0071/Obj_p.h
rename to Tests/QtAutogen/MocCMP0071/Obj_p.h
diff --git a/Tests/QtAutogen/mocCMP0071/main.cpp b/Tests/QtAutogen/MocCMP0071/main.cpp
similarity index 100%
rename from Tests/QtAutogen/mocCMP0071/main.cpp
rename to Tests/QtAutogen/MocCMP0071/main.cpp
diff --git a/Tests/QtAutogen/mocCMP0071/CMakeLists.txt b/Tests/QtAutogen/mocCMP0071/CMakeLists.txt
deleted file mode 100644
index 003fa08..0000000
--- a/Tests/QtAutogen/mocCMP0071/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-project(mocCMP0071 CXX)
-add_subdirectory(OLD)
-add_subdirectory(NEW)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc66d356510c51b5240239a212a511fb0d23dc9a
commit cc66d356510c51b5240239a212a511fb0d23dc9a
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 19:40:17 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:50:17 2017 +0100

    Autogen: Tests: Separate MocInclude test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 43fc851..5775117 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,13 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Tests various include moc patterns
-if(ALLOW_WRAP_CPP)
-  add_subdirectory(mocIncludeStrict)
-  add_subdirectory(mocIncludeRelaxed)
-endif()
-
-# -- Test
 # Tests policy 0071
 if(ALLOW_WRAP_CPP)
   add_subdirectory(mocCMP0071)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 3cd93ab..4d89eae 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -16,3 +16,7 @@ if(NOT QT_TEST_VERSION STREQUAL 4)
   ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
 endif()
 ADD_AUTOGEN_TEST(MocDepends)
+if(QT_TEST_ALLOW_QT_MACROS)
+  ADD_AUTOGEN_TEST(MocIncludeStrict mocIncludeStrict)
+  ADD_AUTOGEN_TEST(MocIncludeRelaxed mocIncludeRelaxed)
+endif()
diff --git a/Tests/QtAutogen/mocInclude/EObjA.cpp b/Tests/QtAutogen/MocInclude/EObjA.cpp
similarity index 97%
rename from Tests/QtAutogen/mocInclude/EObjA.cpp
rename to Tests/QtAutogen/MocInclude/EObjA.cpp
index ca713b2..7681c29 100644
--- a/Tests/QtAutogen/mocInclude/EObjA.cpp
+++ b/Tests/QtAutogen/MocInclude/EObjA.cpp
@@ -35,6 +35,7 @@ EObjA::EObjA()
 
 EObjA::~EObjA()
 {
+  delete d;
 }
 
 // For EObjALocal
diff --git a/Tests/QtAutogen/mocInclude/EObjA.hpp b/Tests/QtAutogen/MocInclude/EObjA.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjA.hpp
rename to Tests/QtAutogen/MocInclude/EObjA.hpp
diff --git a/Tests/QtAutogen/mocInclude/EObjAExtra.cpp b/Tests/QtAutogen/MocInclude/EObjAExtra.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjAExtra.cpp
rename to Tests/QtAutogen/MocInclude/EObjAExtra.cpp
diff --git a/Tests/QtAutogen/mocInclude/EObjAExtra.hpp b/Tests/QtAutogen/MocInclude/EObjAExtra.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjAExtra.hpp
rename to Tests/QtAutogen/MocInclude/EObjAExtra.hpp
diff --git a/Tests/QtAutogen/mocInclude/EObjAExtra_p.hpp b/Tests/QtAutogen/MocInclude/EObjAExtra_p.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjAExtra_p.hpp
rename to Tests/QtAutogen/MocInclude/EObjAExtra_p.hpp
diff --git a/Tests/QtAutogen/mocInclude/EObjA_p.hpp b/Tests/QtAutogen/MocInclude/EObjA_p.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjA_p.hpp
rename to Tests/QtAutogen/MocInclude/EObjA_p.hpp
diff --git a/Tests/QtAutogen/mocInclude/EObjB.cpp b/Tests/QtAutogen/MocInclude/EObjB.cpp
similarity index 97%
rename from Tests/QtAutogen/mocInclude/EObjB.cpp
rename to Tests/QtAutogen/MocInclude/EObjB.cpp
index d19fbfa..3068c68 100644
--- a/Tests/QtAutogen/mocInclude/EObjB.cpp
+++ b/Tests/QtAutogen/MocInclude/EObjB.cpp
@@ -35,6 +35,7 @@ EObjB::EObjB()
 
 EObjB::~EObjB()
 {
+  delete d;
 }
 
 // For EObjBLocal
diff --git a/Tests/QtAutogen/mocInclude/EObjB.hpp b/Tests/QtAutogen/MocInclude/EObjB.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjB.hpp
rename to Tests/QtAutogen/MocInclude/EObjB.hpp
diff --git a/Tests/QtAutogen/mocInclude/EObjB_p.hpp b/Tests/QtAutogen/MocInclude/EObjB_p.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/EObjB_p.hpp
rename to Tests/QtAutogen/MocInclude/EObjB_p.hpp
diff --git a/Tests/QtAutogen/mocInclude/LObjA.cpp b/Tests/QtAutogen/MocInclude/LObjA.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjA.cpp
rename to Tests/QtAutogen/MocInclude/LObjA.cpp
diff --git a/Tests/QtAutogen/mocInclude/LObjA.hpp b/Tests/QtAutogen/MocInclude/LObjA.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjA.hpp
rename to Tests/QtAutogen/MocInclude/LObjA.hpp
diff --git a/Tests/QtAutogen/mocInclude/LObjA_p.h b/Tests/QtAutogen/MocInclude/LObjA_p.h
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjA_p.h
rename to Tests/QtAutogen/MocInclude/LObjA_p.h
diff --git a/Tests/QtAutogen/mocInclude/LObjB.cpp b/Tests/QtAutogen/MocInclude/LObjB.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjB.cpp
rename to Tests/QtAutogen/MocInclude/LObjB.cpp
diff --git a/Tests/QtAutogen/mocInclude/LObjB.hpp b/Tests/QtAutogen/MocInclude/LObjB.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjB.hpp
rename to Tests/QtAutogen/MocInclude/LObjB.hpp
diff --git a/Tests/QtAutogen/mocInclude/LObjB_p.h b/Tests/QtAutogen/MocInclude/LObjB_p.h
similarity index 100%
rename from Tests/QtAutogen/mocInclude/LObjB_p.h
rename to Tests/QtAutogen/MocInclude/LObjB_p.h
diff --git a/Tests/QtAutogen/mocInclude/ObjA.cpp b/Tests/QtAutogen/MocInclude/ObjA.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjA.cpp
rename to Tests/QtAutogen/MocInclude/ObjA.cpp
diff --git a/Tests/QtAutogen/mocInclude/ObjA.hpp b/Tests/QtAutogen/MocInclude/ObjA.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjA.hpp
rename to Tests/QtAutogen/MocInclude/ObjA.hpp
diff --git a/Tests/QtAutogen/mocInclude/ObjA_p.h b/Tests/QtAutogen/MocInclude/ObjA_p.h
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjA_p.h
rename to Tests/QtAutogen/MocInclude/ObjA_p.h
diff --git a/Tests/QtAutogen/mocInclude/ObjB.cpp b/Tests/QtAutogen/MocInclude/ObjB.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjB.cpp
rename to Tests/QtAutogen/MocInclude/ObjB.cpp
diff --git a/Tests/QtAutogen/mocInclude/ObjB.hpp b/Tests/QtAutogen/MocInclude/ObjB.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjB.hpp
rename to Tests/QtAutogen/MocInclude/ObjB.hpp
diff --git a/Tests/QtAutogen/mocInclude/ObjB_p.h b/Tests/QtAutogen/MocInclude/ObjB_p.h
similarity index 100%
rename from Tests/QtAutogen/mocInclude/ObjB_p.h
rename to Tests/QtAutogen/MocInclude/ObjB_p.h
diff --git a/Tests/QtAutogen/mocInclude/SObjA.cpp b/Tests/QtAutogen/MocInclude/SObjA.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjA.cpp
rename to Tests/QtAutogen/MocInclude/SObjA.cpp
diff --git a/Tests/QtAutogen/mocInclude/SObjA.hpp b/Tests/QtAutogen/MocInclude/SObjA.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjA.hpp
rename to Tests/QtAutogen/MocInclude/SObjA.hpp
diff --git a/Tests/QtAutogen/mocInclude/SObjB.cpp.in b/Tests/QtAutogen/MocInclude/SObjB.cpp.in
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjB.cpp.in
rename to Tests/QtAutogen/MocInclude/SObjB.cpp.in
diff --git a/Tests/QtAutogen/mocInclude/SObjB.hpp.in b/Tests/QtAutogen/MocInclude/SObjB.hpp.in
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjB.hpp.in
rename to Tests/QtAutogen/MocInclude/SObjB.hpp.in
diff --git a/Tests/QtAutogen/mocInclude/SObjC.cpp b/Tests/QtAutogen/MocInclude/SObjC.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjC.cpp
rename to Tests/QtAutogen/MocInclude/SObjC.cpp
diff --git a/Tests/QtAutogen/mocInclude/SObjC.hpp b/Tests/QtAutogen/MocInclude/SObjC.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjC.hpp
rename to Tests/QtAutogen/MocInclude/SObjC.hpp
diff --git a/Tests/QtAutogen/mocInclude/SObjCExtra.cpp b/Tests/QtAutogen/MocInclude/SObjCExtra.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjCExtra.cpp
rename to Tests/QtAutogen/MocInclude/SObjCExtra.cpp
diff --git a/Tests/QtAutogen/mocInclude/SObjCExtra.hpp b/Tests/QtAutogen/MocInclude/SObjCExtra.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjCExtra.hpp
rename to Tests/QtAutogen/MocInclude/SObjCExtra.hpp
diff --git a/Tests/QtAutogen/mocInclude/SObjCExtra.moc.in b/Tests/QtAutogen/MocInclude/SObjCExtra.moc.in
similarity index 100%
rename from Tests/QtAutogen/mocInclude/SObjCExtra.moc.in
rename to Tests/QtAutogen/MocInclude/SObjCExtra.moc.in
diff --git a/Tests/QtAutogen/mocInclude/shared.cmake b/Tests/QtAutogen/MocInclude/shared.cmake
similarity index 67%
rename from Tests/QtAutogen/mocInclude/shared.cmake
rename to Tests/QtAutogen/MocInclude/shared.cmake
index d05f27c..2ca2841 100644
--- a/Tests/QtAutogen/mocInclude/shared.cmake
+++ b/Tests/QtAutogen/MocInclude/shared.cmake
@@ -1,24 +1,24 @@
 # Test moc include patterns
-include_directories("../mocInclude")
+include_directories("../MocInclude")
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # Generate .moc file externally and enabled SKIP_AUTOMOC on the file
 qtx_generate_moc(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjA.hpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjA.hpp
   ${CMAKE_CURRENT_BINARY_DIR}/SObjA.moc)
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjA.cpp PROPERTY SKIP_AUTOMOC ON)
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjA.cpp PROPERTY SKIP_AUTOMOC ON)
 
 # Generate .moc file externally from generated source file
 # and enabled SKIP_AUTOMOC on the source file
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/SObjB.hpp
   COMMAND ${CMAKE_COMMAND} -E copy
-    ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjB.hpp.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjB.hpp.in
     ${CMAKE_CURRENT_BINARY_DIR}/SObjB.hpp)
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp
   COMMAND ${CMAKE_COMMAND} -E copy
-    ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjB.cpp.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjB.cpp.in
     ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp)
 qtx_generate_moc(
   ${CMAKE_CURRENT_BINARY_DIR}/SObjB.hpp
@@ -27,10 +27,10 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp PROPERTY SKIP_AUTOMOC
 
 # Generate moc file externally and enabled SKIP_AUTOMOC on the header
 qtx_generate_moc(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjCExtra.hpp
   ${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp)
 set_property(
-  SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp
+  SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjCExtra.hpp
   PROPERTY SKIP_AUTOMOC ON)
 # Custom target to depend on
 set(SOBJC_MOC ${CMAKE_CURRENT_BINARY_DIR}/moc_SObjCExtra.cpp)
@@ -38,32 +38,32 @@ add_custom_target("${MOC_INCLUDE_NAME}_SOBJC"
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp
   BYPRODUCTS ${SOBJC_MOC}
   COMMAND ${CMAKE_COMMAND} -E copy
-    ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.moc.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/SObjCExtra.moc.in
     ${SOBJC_MOC})
 
 # MOC_INCLUDE_NAME must be defined by the includer
 add_executable(${MOC_INCLUDE_NAME}
   # Common sources
-  ../mocInclude/ObjA.cpp
-  ../mocInclude/ObjB.cpp
+  ../MocInclude/ObjA.cpp
+  ../MocInclude/ObjB.cpp
 
-  ../mocInclude/LObjA.cpp
-  ../mocInclude/LObjB.cpp
+  ../MocInclude/LObjA.cpp
+  ../MocInclude/LObjB.cpp
 
-  ../mocInclude/EObjA.cpp
-  ../mocInclude/EObjAExtra.cpp
-  ../mocInclude/EObjB.cpp
-  ../mocInclude/subExtra/EObjBExtra.cpp
+  ../MocInclude/EObjA.cpp
+  ../MocInclude/EObjAExtra.cpp
+  ../MocInclude/EObjB.cpp
+  ../MocInclude/subExtra/EObjBExtra.cpp
 
-  ../mocInclude/SObjA.cpp
+  ../MocInclude/SObjA.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/SObjA.moc
   ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/SObjB.moc
-  ../mocInclude/SObjC.cpp
-  ../mocInclude/SObjCExtra.hpp
-  ../mocInclude/SObjCExtra.cpp
+  ../MocInclude/SObjC.cpp
+  ../MocInclude/SObjCExtra.hpp
+  ../MocInclude/SObjCExtra.cpp
 
-  ../mocInclude/subGlobal/GObj.cpp
+  ../MocInclude/subGlobal/GObj.cpp
   main.cpp
 )
 add_dependencies(${MOC_INCLUDE_NAME} "${MOC_INCLUDE_NAME}_SOBJC")
diff --git a/Tests/QtAutogen/mocInclude/subExtra/EObjBExtra.cpp b/Tests/QtAutogen/MocInclude/subExtra/EObjBExtra.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subExtra/EObjBExtra.cpp
rename to Tests/QtAutogen/MocInclude/subExtra/EObjBExtra.cpp
diff --git a/Tests/QtAutogen/mocInclude/subExtra/EObjBExtra.hpp b/Tests/QtAutogen/MocInclude/subExtra/EObjBExtra.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subExtra/EObjBExtra.hpp
rename to Tests/QtAutogen/MocInclude/subExtra/EObjBExtra.hpp
diff --git a/Tests/QtAutogen/mocInclude/subExtra/EObjBExtra_p.hpp b/Tests/QtAutogen/MocInclude/subExtra/EObjBExtra_p.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subExtra/EObjBExtra_p.hpp
rename to Tests/QtAutogen/MocInclude/subExtra/EObjBExtra_p.hpp
diff --git a/Tests/QtAutogen/mocInclude/subGlobal/GObj.cpp b/Tests/QtAutogen/MocInclude/subGlobal/GObj.cpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subGlobal/GObj.cpp
rename to Tests/QtAutogen/MocInclude/subGlobal/GObj.cpp
diff --git a/Tests/QtAutogen/mocInclude/subGlobal/GObj.hpp b/Tests/QtAutogen/MocInclude/subGlobal/GObj.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subGlobal/GObj.hpp
rename to Tests/QtAutogen/MocInclude/subGlobal/GObj.hpp
diff --git a/Tests/QtAutogen/mocInclude/subGlobal/GObj_p.hpp b/Tests/QtAutogen/MocInclude/subGlobal/GObj_p.hpp
similarity index 100%
rename from Tests/QtAutogen/mocInclude/subGlobal/GObj_p.hpp
rename to Tests/QtAutogen/MocInclude/subGlobal/GObj_p.hpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/CMakeLists.txt b/Tests/QtAutogen/MocIncludeRelaxed/CMakeLists.txt
similarity index 69%
rename from Tests/QtAutogen/mocIncludeRelaxed/CMakeLists.txt
rename to Tests/QtAutogen/MocIncludeRelaxed/CMakeLists.txt
index 97ba1df..b1c4fc3 100644
--- a/Tests/QtAutogen/mocIncludeRelaxed/CMakeLists.txt
+++ b/Tests/QtAutogen/MocIncludeRelaxed/CMakeLists.txt
@@ -1,10 +1,13 @@
-# Test moc include patterns
+cmake_minimum_required(VERSION 3.10)
+project(MocIncludeRelaxed)
+include("../AutogenTest.cmake")
 
+# Test moc include patterns
 set(CMAKE_AUTOMOC_RELAXED_MODE TRUE)
 
 # Shared executable
 set(MOC_INCLUDE_NAME "mocIncludeRelaxed")
-include(${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/shared.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/shared.cmake)
 
 # Relaxed ony executable
 add_executable(mocIncludeRelaxedOnly
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RMain.cpp b/Tests/QtAutogen/MocIncludeRelaxed/RMain.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RMain.cpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RMain.cpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjA.cpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjA.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjA.cpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjA.cpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjA.hpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjA.hpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjA.hpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjA.hpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjB.cpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjB.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjB.cpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjB.cpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjB.hpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjB.hpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjB.hpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjB.hpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjBExtra.hpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjBExtra.hpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjBExtra.hpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjBExtra.hpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjC.cpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjC.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjC.cpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjC.cpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/RObjC.hpp b/Tests/QtAutogen/MocIncludeRelaxed/RObjC.hpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/RObjC.hpp
rename to Tests/QtAutogen/MocIncludeRelaxed/RObjC.hpp
diff --git a/Tests/QtAutogen/mocIncludeRelaxed/main.cpp b/Tests/QtAutogen/MocIncludeRelaxed/main.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeRelaxed/main.cpp
rename to Tests/QtAutogen/MocIncludeRelaxed/main.cpp
diff --git a/Tests/QtAutogen/MocIncludeStrict/CMakeLists.txt b/Tests/QtAutogen/MocIncludeStrict/CMakeLists.txt
new file mode 100644
index 0000000..2cf0fed
--- /dev/null
+++ b/Tests/QtAutogen/MocIncludeStrict/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocIncludeStrict)
+include("../AutogenTest.cmake")
+
+# Test moc include patterns
+set(CMAKE_AUTOMOC_RELAXED_MODE FALSE)
+
+# Shared executable
+set(MOC_INCLUDE_NAME "mocIncludeStrict")
+include(${CMAKE_CURRENT_SOURCE_DIR}/../MocInclude/shared.cmake)
diff --git a/Tests/QtAutogen/mocIncludeStrict/main.cpp b/Tests/QtAutogen/MocIncludeStrict/main.cpp
similarity index 100%
rename from Tests/QtAutogen/mocIncludeStrict/main.cpp
rename to Tests/QtAutogen/MocIncludeStrict/main.cpp
diff --git a/Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt b/Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt
deleted file mode 100644
index 789354a..0000000
--- a/Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Test moc include patterns
-
-set(CMAKE_AUTOMOC_RELAXED_MODE FALSE)
-set(MOC_INCLUDE_NAME "mocIncludeStrict")
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/shared.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7971202b3c58f78008f5b651c048910fcc49c49f
commit 7971202b3c58f78008f5b651c048910fcc49c49f
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 19:27:10 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate MocDepends test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 6b54b1a..43fc851 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Tests AUTOMOC with generated sources
-add_subdirectory(mocDepends)
-
-# -- Test
 # Tests various include moc patterns
 if(ALLOW_WRAP_CPP)
   add_subdirectory(mocIncludeStrict)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 6a92873..3cd93ab 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -15,3 +15,4 @@ ADD_AUTOGEN_TEST(RccSkipSource)
 if(NOT QT_TEST_VERSION STREQUAL 4)
   ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
 endif()
+ADD_AUTOGEN_TEST(MocDepends)
diff --git a/Tests/QtAutogen/mocDepends/CMakeLists.txt b/Tests/QtAutogen/MocDepends/CMakeLists.txt
similarity index 89%
rename from Tests/QtAutogen/mocDepends/CMakeLists.txt
rename to Tests/QtAutogen/MocDepends/CMakeLists.txt
index 8217b8d..6ea72be 100644
--- a/Tests/QtAutogen/mocDepends/CMakeLists.txt
+++ b/Tests/QtAutogen/MocDepends/CMakeLists.txt
@@ -1,18 +1,6 @@
-cmake_minimum_required(VERSION 3.9)
-cmake_policy(SET CMP0071 NEW)
-project(mocDepends CXX)
-
-if (QT_TEST_VERSION STREQUAL 4)
-  find_package(Qt4 REQUIRED)
-  set(QT_CORE_TARGET Qt4::QtCore)
-else()
-  if (NOT QT_TEST_VERSION STREQUAL 5)
-    message(SEND_ERROR "Invalid Qt version specified.")
-  endif()
-
-  find_package(Qt5Core REQUIRED)
-  set(QT_CORE_TARGET Qt5::Core)
-endif()
+cmake_minimum_required(VERSION 3.10)
+project(MocDepends)
+include("../AutogenTest.cmake")
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 set(CSD ${CMAKE_CURRENT_SOURCE_DIR})
@@ -42,7 +30,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/object_valid.hpp.in ${CBD}/GenFile.hpp)
 
 add_executable(mocDepGenFile testGenFile.cpp ${CBD}/GenFile.hpp)
-target_link_libraries(mocDepGenFile ${QT_CORE_TARGET})
+target_link_libraries(mocDepGenFile ${QT_QTCORE_TARGET})
 set_target_properties(mocDepGenFile PROPERTIES AUTOMOC TRUE)
 
 
@@ -69,7 +57,7 @@ add_custom_target(mocDepTargetUtil
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/object_valid.hpp.in ${CBD}/GenTarget.hpp)
 
 add_executable(mocDepTarget testGenTarget.cpp)
-target_link_libraries(mocDepTarget ${QT_CORE_TARGET})
+target_link_libraries(mocDepTarget ${QT_QTCORE_TARGET})
 set_target_properties(mocDepTarget PROPERTIES AUTOMOC TRUE)
 add_dependencies(mocDepTarget mocDepTargetUtil)
 
@@ -96,10 +84,10 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/simpleLib.hpp.in ${CBD}/simpleLib.hpp
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/simpleLib.cpp.in ${CBD}/simpleLib.cpp)
 add_library(SimpleLib STATIC ${CBD}/simpleLib.hpp ${CBD}/simpleLib.cpp)
-target_link_libraries(SimpleLib ${QT_CORE_TARGET})
+target_link_libraries(SimpleLib ${QT_QTCORE_TARGET})
 
 add_executable(mocDepGenLib testGenLib.cpp)
-target_link_libraries(mocDepGenLib SimpleLib ${QT_CORE_TARGET})
+target_link_libraries(mocDepGenLib SimpleLib ${QT_QTCORE_TARGET})
 set_target_properties(mocDepGenLib PROPERTIES AUTOMOC TRUE)
 
 
@@ -122,7 +110,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/object_valid.hpp.in ${CBD}/ATDFile.hpp)
 
 add_executable(mocDepATDFile testATDFile.cpp)
-target_link_libraries(mocDepATDFile ${QT_CORE_TARGET})
+target_link_libraries(mocDepATDFile ${QT_QTCORE_TARGET})
 set_target_properties(mocDepATDFile PROPERTIES AUTOMOC TRUE)
 set_target_properties(mocDepATDFile PROPERTIES AUTOGEN_TARGET_DEPENDS ${CBD}/ATDFile.hpp)
 
@@ -146,6 +134,6 @@ add_custom_target(mocDepATDTargetUtil
   COMMAND ${CMAKE_COMMAND} -E copy ${CSD}/object_valid.hpp.in ${CBD}/ATDTarget.hpp)
 
 add_executable(mocDepATDTarget testATDTarget.cpp)
-target_link_libraries(mocDepATDTarget ${QT_CORE_TARGET})
+target_link_libraries(mocDepATDTarget ${QT_QTCORE_TARGET})
 set_target_properties(mocDepATDTarget PROPERTIES AUTOMOC TRUE)
 set_target_properties(mocDepATDTarget PROPERTIES AUTOGEN_TARGET_DEPENDS mocDepATDTargetUtil)
diff --git a/Tests/QtAutogen/mocDepends/object_invalid.hpp.in b/Tests/QtAutogen/MocDepends/object_invalid.hpp.in
similarity index 100%
rename from Tests/QtAutogen/mocDepends/object_invalid.hpp.in
rename to Tests/QtAutogen/MocDepends/object_invalid.hpp.in
diff --git a/Tests/QtAutogen/mocDepends/object_valid.hpp.in b/Tests/QtAutogen/MocDepends/object_valid.hpp.in
similarity index 100%
rename from Tests/QtAutogen/mocDepends/object_valid.hpp.in
rename to Tests/QtAutogen/MocDepends/object_valid.hpp.in
diff --git a/Tests/QtAutogen/mocDepends/simpleLib.cpp.in b/Tests/QtAutogen/MocDepends/simpleLib.cpp.in
similarity index 100%
rename from Tests/QtAutogen/mocDepends/simpleLib.cpp.in
rename to Tests/QtAutogen/MocDepends/simpleLib.cpp.in
diff --git a/Tests/QtAutogen/mocDepends/simpleLib.hpp.in b/Tests/QtAutogen/MocDepends/simpleLib.hpp.in
similarity index 100%
rename from Tests/QtAutogen/mocDepends/simpleLib.hpp.in
rename to Tests/QtAutogen/MocDepends/simpleLib.hpp.in
diff --git a/Tests/QtAutogen/mocDepends/testATDFile.cpp b/Tests/QtAutogen/MocDepends/testATDFile.cpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testATDFile.cpp
rename to Tests/QtAutogen/MocDepends/testATDFile.cpp
diff --git a/Tests/QtAutogen/mocDepends/testATDTarget.cpp b/Tests/QtAutogen/MocDepends/testATDTarget.cpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testATDTarget.cpp
rename to Tests/QtAutogen/MocDepends/testATDTarget.cpp
diff --git a/Tests/QtAutogen/mocDepends/testGenFile.cpp b/Tests/QtAutogen/MocDepends/testGenFile.cpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testGenFile.cpp
rename to Tests/QtAutogen/MocDepends/testGenFile.cpp
diff --git a/Tests/QtAutogen/mocDepends/testGenLib.cpp b/Tests/QtAutogen/MocDepends/testGenLib.cpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testGenLib.cpp
rename to Tests/QtAutogen/MocDepends/testGenLib.cpp
diff --git a/Tests/QtAutogen/mocDepends/testGenLib.hpp b/Tests/QtAutogen/MocDepends/testGenLib.hpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testGenLib.hpp
rename to Tests/QtAutogen/MocDepends/testGenLib.hpp
diff --git a/Tests/QtAutogen/mocDepends/testGenTarget.cpp b/Tests/QtAutogen/MocDepends/testGenTarget.cpp
similarity index 100%
rename from Tests/QtAutogen/mocDepends/testGenTarget.cpp
rename to Tests/QtAutogen/MocDepends/testGenTarget.cpp

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb7e52ca3d920ca1de8b2abb23da3d83db988eca
commit fb7e52ca3d920ca1de8b2abb23da3d83db988eca
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 19:15:26 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate MocMacroName test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index e5940d8..6b54b1a 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,12 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# MOC AUTOMOC_MACRO_NAMES
-if (NOT QT_TEST_VERSION STREQUAL 4)
-  add_subdirectory(mocMacroName)
-endif()
-
-# -- Test
 # Tests AUTOMOC with generated sources
 add_subdirectory(mocDepends)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index fdf41b6..6a92873 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -12,3 +12,6 @@ if(QT_TEST_ALLOW_QT_MACROS)
 endif()
 ADD_AUTOGEN_TEST(UicSkipSource)
 ADD_AUTOGEN_TEST(RccSkipSource)
+if(NOT QT_TEST_VERSION STREQUAL 4)
+  ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
+endif()
diff --git a/Tests/QtAutogen/MocMacroName/CMakeLists.txt b/Tests/QtAutogen/MocMacroName/CMakeLists.txt
new file mode 100644
index 0000000..f0251a2
--- /dev/null
+++ b/Tests/QtAutogen/MocMacroName/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocMacroName)
+include("../AutogenTest.cmake")
+
+# Test CMAKE_AUTOMOC_MACRO_NAMES and AUTOMOC_MACRO_NAMES
+list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "QO1_ALIAS")
+
+add_executable(mocMacroName
+  main.cpp
+  Gadget.cpp
+  Object.cpp
+  Object1Aliased.cpp
+  Object2Aliased.cpp
+)
+set_property(TARGET mocMacroName PROPERTY AUTOMOC ON)
+set_property(TARGET mocMacroName APPEND PROPERTY AUTOMOC_MACRO_NAMES "QO2_ALIAS")
+target_link_libraries(mocMacroName ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/mocMacroName/CustomMacros.hpp b/Tests/QtAutogen/MocMacroName/CustomMacros.hpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/CustomMacros.hpp
rename to Tests/QtAutogen/MocMacroName/CustomMacros.hpp
diff --git a/Tests/QtAutogen/mocMacroName/Gadget.cpp b/Tests/QtAutogen/MocMacroName/Gadget.cpp
similarity index 77%
rename from Tests/QtAutogen/mocMacroName/Gadget.cpp
rename to Tests/QtAutogen/MocMacroName/Gadget.cpp
index 167faeb..d7cb515 100644
--- a/Tests/QtAutogen/mocMacroName/Gadget.cpp
+++ b/Tests/QtAutogen/MocMacroName/Gadget.cpp
@@ -1,6 +1,6 @@
 #include "Gadget.hpp"
 
 Gadget::Gadget()
-  : test(0)
+  : _test(0)
 {
 }
diff --git a/Tests/QtAutogen/mocMacroName/Gadget.hpp b/Tests/QtAutogen/MocMacroName/Gadget.hpp
similarity index 55%
rename from Tests/QtAutogen/mocMacroName/Gadget.hpp
rename to Tests/QtAutogen/MocMacroName/Gadget.hpp
index 2587ed2..cab792e 100644
--- a/Tests/QtAutogen/mocMacroName/Gadget.hpp
+++ b/Tests/QtAutogen/MocMacroName/Gadget.hpp
@@ -6,10 +6,14 @@
 class Gadget
 {
   Q_GADGET
-  Q_PROPERTY(int test MEMBER test)
+  Q_PROPERTY(int test READ getTest)
 public:
   Gadget();
-  int test;
+
+  int getTest() { return _test; }
+
+private:
+  int _test;
 };
 
 #endif
diff --git a/Tests/QtAutogen/mocMacroName/Object.cpp b/Tests/QtAutogen/MocMacroName/Object.cpp
similarity index 84%
rename from Tests/QtAutogen/mocMacroName/Object.cpp
rename to Tests/QtAutogen/MocMacroName/Object.cpp
index c0b4f33..800ebf3 100644
--- a/Tests/QtAutogen/mocMacroName/Object.cpp
+++ b/Tests/QtAutogen/MocMacroName/Object.cpp
@@ -1,6 +1,7 @@
 #include "Object.hpp"
 
 Object::Object()
+  : _test(0)
 {
 }
 
diff --git a/Tests/QtAutogen/mocMacroName/Object.hpp b/Tests/QtAutogen/MocMacroName/Object.hpp
similarity index 63%
rename from Tests/QtAutogen/mocMacroName/Object.hpp
rename to Tests/QtAutogen/MocMacroName/Object.hpp
index 0c40824..aadae1f 100644
--- a/Tests/QtAutogen/mocMacroName/Object.hpp
+++ b/Tests/QtAutogen/MocMacroName/Object.hpp
@@ -6,14 +6,17 @@
 class Object : public QObject
 {
   Q_OBJECT
-  Q_PROPERTY(int test MEMBER test)
+  Q_PROPERTY(int test READ getTest)
 public:
   Object();
 
+  int getTest() { return _test; }
+
   Q_SLOT
   void aSlot();
 
-  int test;
+private:
+  int _test;
 };
 
 #endif
diff --git a/Tests/QtAutogen/mocMacroName/Object1Aliased.cpp b/Tests/QtAutogen/MocMacroName/Object1Aliased.cpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/Object1Aliased.cpp
rename to Tests/QtAutogen/MocMacroName/Object1Aliased.cpp
diff --git a/Tests/QtAutogen/mocMacroName/Object1Aliased.hpp b/Tests/QtAutogen/MocMacroName/Object1Aliased.hpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/Object1Aliased.hpp
rename to Tests/QtAutogen/MocMacroName/Object1Aliased.hpp
diff --git a/Tests/QtAutogen/mocMacroName/Object2Aliased.cpp b/Tests/QtAutogen/MocMacroName/Object2Aliased.cpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/Object2Aliased.cpp
rename to Tests/QtAutogen/MocMacroName/Object2Aliased.cpp
diff --git a/Tests/QtAutogen/mocMacroName/Object2Aliased.hpp b/Tests/QtAutogen/MocMacroName/Object2Aliased.hpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/Object2Aliased.hpp
rename to Tests/QtAutogen/MocMacroName/Object2Aliased.hpp
diff --git a/Tests/QtAutogen/mocMacroName/main.cpp b/Tests/QtAutogen/MocMacroName/main.cpp
similarity index 100%
rename from Tests/QtAutogen/mocMacroName/main.cpp
rename to Tests/QtAutogen/MocMacroName/main.cpp
diff --git a/Tests/QtAutogen/mocMacroName/CMakeLists.txt b/Tests/QtAutogen/mocMacroName/CMakeLists.txt
deleted file mode 100644
index 08e6803..0000000
--- a/Tests/QtAutogen/mocMacroName/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.9)
-
-list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "QO1_ALIAS")
-
-add_executable(mmn main.cpp Gadget.cpp Object.cpp Object1Aliased.cpp Object2Aliased.cpp)
-set_property(TARGET mmn PROPERTY AUTOMOC ON)
-set_property(TARGET mmn APPEND PROPERTY AUTOMOC_MACRO_NAMES "QO2_ALIAS")
-target_link_libraries(mmn ${QT_LIBRARIES})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cab8c307c7df585152e3ab9e007574cb0e690dc
commit 5cab8c307c7df585152e3ab9e007574cb0e690dc
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 18:55:43 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate RccSkipSource test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 317de7e..e5940d8 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,27 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Test for SKIP_AUTORCC and SKIP_AUTOGEN on an AUTORCC enabled target
-set(skipRccSources
-  skipRcc.cpp
-  skipSource/skipRccBad1.qrc
-  skipSource/skipRccBad2.qrc
-  skipSource/skipRccGood.qrc
-)
-set_property(SOURCE skipSource/skipRccBad1.qrc PROPERTY SKIP_AUTORCC ON)
-set_property(SOURCE skipSource/skipRccBad2.qrc PROPERTY SKIP_AUTOGEN ON)
-# AUTORCC enabled
-add_executable(skipRccA ${skipRccSources})
-set_property(TARGET skipRccA PROPERTY AUTORCC ON)
-target_link_libraries(skipRccA ${QT_LIBRARIES})
-# AUTORCC, AUTOUIC and AUTOMOC enabled
-add_executable(skipRccB ${skipRccSources})
-set_property(TARGET skipRccB PROPERTY AUTORCC ON)
-set_property(TARGET skipRccB PROPERTY AUTOUIC ON)
-set_property(TARGET skipRccB PROPERTY AUTOMOC ON)
-target_link_libraries(skipRccB ${QT_LIBRARIES})
-
-# -- Test
 # MOC AUTOMOC_MACRO_NAMES
 if (NOT QT_TEST_VERSION STREQUAL 4)
   add_subdirectory(mocMacroName)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 2c4788b..fdf41b6 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -11,3 +11,4 @@ if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocSkipSource)
 endif()
 ADD_AUTOGEN_TEST(UicSkipSource)
+ADD_AUTOGEN_TEST(RccSkipSource)
diff --git a/Tests/QtAutogen/RccSkipSource/CMakeLists.txt b/Tests/QtAutogen/RccSkipSource/CMakeLists.txt
new file mode 100644
index 0000000..f8a8032
--- /dev/null
+++ b/Tests/QtAutogen/RccSkipSource/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.10)
+project(RccSkipSource)
+include("../AutogenTest.cmake")
+
+# Test for SKIP_AUTORCC and SKIP_AUTOGEN on an AUTORCC enabled target
+set(skipRccSources
+  skipRcc.cpp
+  skipRccBad1.qrc
+  skipRccBad2.qrc
+  skipRccGood.qrc
+)
+set_property(SOURCE skipRccBad1.qrc PROPERTY SKIP_AUTORCC ON)
+set_property(SOURCE skipRccBad2.qrc PROPERTY SKIP_AUTOGEN ON)
+# AUTORCC enabled
+add_executable(skipRccA ${skipRccSources})
+set_property(TARGET skipRccA PROPERTY AUTORCC ON)
+target_link_libraries(skipRccA ${QT_LIBRARIES})
+# AUTORCC, AUTOUIC and AUTOMOC enabled
+add_executable(skipRccB ${skipRccSources})
+set_property(TARGET skipRccB PROPERTY AUTORCC ON)
+set_property(TARGET skipRccB PROPERTY AUTOUIC ON)
+set_property(TARGET skipRccB PROPERTY AUTOMOC ON)
+target_link_libraries(skipRccB ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/skipRcc.cpp b/Tests/QtAutogen/RccSkipSource/skipRcc.cpp
similarity index 100%
rename from Tests/QtAutogen/skipRcc.cpp
rename to Tests/QtAutogen/RccSkipSource/skipRcc.cpp
diff --git a/Tests/QtAutogen/skipSource/skipRccBad1.qrc b/Tests/QtAutogen/RccSkipSource/skipRccBad1.qrc
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipRccBad1.qrc
rename to Tests/QtAutogen/RccSkipSource/skipRccBad1.qrc
diff --git a/Tests/QtAutogen/skipSource/skipRccBad2.qrc b/Tests/QtAutogen/RccSkipSource/skipRccBad2.qrc
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipRccBad2.qrc
rename to Tests/QtAutogen/RccSkipSource/skipRccBad2.qrc
diff --git a/Tests/QtAutogen/skipSource/skipRccGood.qrc b/Tests/QtAutogen/RccSkipSource/skipRccGood.qrc
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipRccGood.qrc
rename to Tests/QtAutogen/RccSkipSource/skipRccGood.qrc

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f11321efd11ce4958d45f4673465b5b9484f1af2
commit f11321efd11ce4958d45f4673465b5b9484f1af2
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 18:47:15 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate UicSkipSource test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index d09823f..317de7e 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,26 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Test for SKIP_AUTOUIC and SKIP_AUTOGEN on an AUTOUIC enabled target
-set(skipUicSources
-  skipUic.cpp
-  skipSource/skipUicGen.cpp
-  skipSource/skipUicNoGen1.cpp
-  skipSource/skipUicNoGen2.cpp
-)
-set_property(SOURCE skipSource/skipUicNoGen1.cpp PROPERTY SKIP_AUTOUIC ON)
-set_property(SOURCE skipSource/skipUicNoGen2.cpp PROPERTY SKIP_AUTOGEN ON)
-# AUTOUIC enabled
-add_executable(skipUicA ${skipUicSources})
-set_property(TARGET skipUicA PROPERTY AUTOUIC ON)
-target_link_libraries(skipUicA ${QT_LIBRARIES})
-# AUTOUIC and AUTOMOC enabled
-add_executable(skipUicB ${skipUicSources})
-set_property(TARGET skipUicB PROPERTY AUTOUIC ON)
-set_property(TARGET skipUicB PROPERTY AUTOMOC ON)
-target_link_libraries(skipUicB ${QT_LIBRARIES})
-
-# -- Test
 # Test for SKIP_AUTORCC and SKIP_AUTOGEN on an AUTORCC enabled target
 set(skipRccSources
   skipRcc.cpp
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 072a853..2c4788b 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -10,3 +10,4 @@ ADD_AUTOGEN_TEST(RccOffMocLibrary)
 if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(MocSkipSource)
 endif()
+ADD_AUTOGEN_TEST(UicSkipSource)
diff --git a/Tests/QtAutogen/UicSkipSource/CMakeLists.txt b/Tests/QtAutogen/UicSkipSource/CMakeLists.txt
new file mode 100644
index 0000000..e94864d
--- /dev/null
+++ b/Tests/QtAutogen/UicSkipSource/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 3.10)
+project(UicSkipSource)
+include("../AutogenTest.cmake")
+
+# Test for SKIP_AUTOUIC and SKIP_AUTOGEN on an AUTOUIC enabled target
+set(skipUicSources
+  skipUic.cpp
+  skipUicGen.cpp
+  skipUicNoGen1.cpp
+  skipUicNoGen2.cpp
+)
+set_property(SOURCE skipUicNoGen1.cpp PROPERTY SKIP_AUTOUIC ON)
+set_property(SOURCE skipUicNoGen2.cpp PROPERTY SKIP_AUTOGEN ON)
+# AUTOUIC enabled
+add_executable(skipUicA ${skipUicSources})
+set_property(TARGET skipUicA PROPERTY AUTOUIC ON)
+target_link_libraries(skipUicA ${QT_LIBRARIES})
+# AUTOUIC and AUTOMOC enabled
+add_executable(skipUicB ${skipUicSources})
+set_property(TARGET skipUicB PROPERTY AUTOUIC ON)
+set_property(TARGET skipUicB PROPERTY AUTOMOC ON)
+target_link_libraries(skipUicB ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/skipUic.cpp b/Tests/QtAutogen/UicSkipSource/skipUic.cpp
similarity index 57%
rename from Tests/QtAutogen/skipUic.cpp
rename to Tests/QtAutogen/UicSkipSource/skipUic.cpp
index 0adf011..c4a7ce9 100644
--- a/Tests/QtAutogen/skipUic.cpp
+++ b/Tests/QtAutogen/UicSkipSource/skipUic.cpp
@@ -1,7 +1,7 @@
 
-#include "skipSource/skipUicGen.hpp"
-#include "skipSource/skipUicNoGen1.hpp"
-#include "skipSource/skipUicNoGen2.hpp"
+#include "skipUicGen.hpp"
+#include "skipUicNoGen1.hpp"
+#include "skipUicNoGen2.hpp"
 
 int main(int, char**)
 {
diff --git a/Tests/QtAutogen/skipSource/skipUicGen.cpp b/Tests/QtAutogen/UicSkipSource/skipUicGen.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicGen.cpp
rename to Tests/QtAutogen/UicSkipSource/skipUicGen.cpp
diff --git a/Tests/QtAutogen/skipSource/skipUicGen.hpp b/Tests/QtAutogen/UicSkipSource/skipUicGen.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicGen.hpp
rename to Tests/QtAutogen/UicSkipSource/skipUicGen.hpp
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen1.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicNoGen1.cpp
rename to Tests/QtAutogen/UicSkipSource/skipUicNoGen1.cpp
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen1.hpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen1.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicNoGen1.hpp
rename to Tests/QtAutogen/UicSkipSource/skipUicNoGen1.hpp
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen2.cpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicNoGen2.cpp
rename to Tests/QtAutogen/UicSkipSource/skipUicNoGen2.cpp
diff --git a/Tests/QtAutogen/skipSource/skipUicNoGen2.hpp b/Tests/QtAutogen/UicSkipSource/skipUicNoGen2.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/skipUicNoGen2.hpp
rename to Tests/QtAutogen/UicSkipSource/skipUicNoGen2.hpp
diff --git a/Tests/QtAutogen/skipSource/ui_nogen1.h b/Tests/QtAutogen/UicSkipSource/ui_nogen1.h
similarity index 100%
rename from Tests/QtAutogen/skipSource/ui_nogen1.h
rename to Tests/QtAutogen/UicSkipSource/ui_nogen1.h
diff --git a/Tests/QtAutogen/skipSource/ui_nogen2.h b/Tests/QtAutogen/UicSkipSource/ui_nogen2.h
similarity index 89%
rename from Tests/QtAutogen/skipSource/ui_nogen2.h
rename to Tests/QtAutogen/UicSkipSource/ui_nogen2.h
index 5d547d4..4e500a4 100644
--- a/Tests/QtAutogen/skipSource/ui_nogen2.h
+++ b/Tests/QtAutogen/UicSkipSource/ui_nogen2.h
@@ -3,4 +3,4 @@
 
 void ui_nogen2();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Tests/QtAutogen/skipSource/uigen1.ui b/Tests/QtAutogen/UicSkipSource/uigen1.ui
similarity index 100%
rename from Tests/QtAutogen/skipSource/uigen1.ui
rename to Tests/QtAutogen/UicSkipSource/uigen1.ui
diff --git a/Tests/QtAutogen/skipSource/uigen2.ui b/Tests/QtAutogen/UicSkipSource/uigen2.ui
similarity index 100%
rename from Tests/QtAutogen/skipSource/uigen2.ui
rename to Tests/QtAutogen/UicSkipSource/uigen2.ui

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0af9da29e487f0a6c60c379f0773a68b40ce2625
commit 0af9da29e487f0a6c60c379f0773a68b40ce2625
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 18:24:52 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate MocSkipSource test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 723747a..d09823f 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,41 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target
-if(ALLOW_WRAP_CPP)
-  # Generate header mocs manually
-  qtx_wrap_cpp(skipMocWrapMoc
-    skipSource/qItemA.hpp
-    skipSource/qItemB.hpp
-    skipSource/qItemC.hpp
-    skipSource/qItemD.hpp
-    )
-  set(skipMocSources
-    skipMoc.cpp
-    skipSource/qItemA.cpp
-    skipSource/qItemB.cpp
-    skipSource/qItemC.cpp
-    skipSource/qItemD.cpp
-    )
-  # When cpp files are skipped, the hpp won't be processed either,
-  # unless they are mentioned in the sources - which they aren't.
-  set_property(SOURCE skipSource/qItemA.cpp PROPERTY SKIP_AUTOMOC ON)
-  set_property(SOURCE skipSource/qItemB.cpp PROPERTY SKIP_AUTOGEN ON)
-  # When hpp files are skipped, the cpp still get processed.
-  set_property(SOURCE skipSource/qItemC.hpp PROPERTY SKIP_AUTOMOC ON)
-  set_property(SOURCE skipSource/qItemD.hpp PROPERTY SKIP_AUTOGEN ON)
-  # AUTOMOC enabled only
-  add_executable(skipMocA ${skipMocSources} ${skipMocWrapMoc})
-  set_property(TARGET skipMocA PROPERTY AUTOMOC ON)
-  target_link_libraries(skipMocA ${QT_LIBRARIES})
-  # AUTOMOC and AUTOUIC enabled
-  add_executable(skipMocB ${skipMocSources} ${skipMocWrapMoc})
-  set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
-  set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
-  target_link_libraries(skipMocB ${QT_LIBRARIES})
-endif()
-
-# -- Test
 # Test for SKIP_AUTOUIC and SKIP_AUTOGEN on an AUTOUIC enabled target
 set(skipUicSources
   skipUic.cpp
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index f998b74..072a853 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -7,3 +7,6 @@ endif()
 ADD_AUTOGEN_TEST(RccOnly rccOnly)
 ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
 ADD_AUTOGEN_TEST(RccOffMocLibrary)
+if(QT_TEST_ALLOW_QT_MACROS)
+  ADD_AUTOGEN_TEST(MocSkipSource)
+endif()
diff --git a/Tests/QtAutogen/MocSkipSource/CMakeLists.txt b/Tests/QtAutogen/MocSkipSource/CMakeLists.txt
new file mode 100644
index 0000000..8d1fa6a
--- /dev/null
+++ b/Tests/QtAutogen/MocSkipSource/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocSkipSource)
+include("../AutogenTest.cmake")
+
+# Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target
+
+# Generate header mocs manually
+qtx_wrap_cpp(skipMocWrapMoc
+  qItemA.hpp
+  qItemB.hpp
+  qItemC.hpp
+  qItemD.hpp
+)
+set(skipMocSources
+  skipMoc.cpp
+  qItemA.cpp
+  qItemB.cpp
+  qItemC.cpp
+  qItemD.cpp
+)
+# When cpp files are skipped, the hpp won't be processed either,
+# unless they are mentioned in the sources - which they aren't.
+set_property(SOURCE qItemA.cpp PROPERTY SKIP_AUTOMOC ON)
+set_property(SOURCE qItemB.cpp PROPERTY SKIP_AUTOGEN ON)
+# When hpp files are skipped, the cpp still get processed.
+set_property(SOURCE qItemC.hpp PROPERTY SKIP_AUTOMOC ON)
+set_property(SOURCE qItemD.hpp PROPERTY SKIP_AUTOGEN ON)
+# AUTOMOC enabled only
+add_executable(skipMocA ${skipMocSources} ${skipMocWrapMoc})
+set_property(TARGET skipMocA PROPERTY AUTOMOC ON)
+target_link_libraries(skipMocA ${QT_LIBRARIES})
+# AUTOMOC and AUTOUIC enabled
+add_executable(skipMocB ${skipMocSources} ${skipMocWrapMoc})
+set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
+set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
+target_link_libraries(skipMocB ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/skipSource/qItemA.cpp b/Tests/QtAutogen/MocSkipSource/qItemA.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemA.cpp
rename to Tests/QtAutogen/MocSkipSource/qItemA.cpp
diff --git a/Tests/QtAutogen/skipSource/qItemA.hpp b/Tests/QtAutogen/MocSkipSource/qItemA.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemA.hpp
rename to Tests/QtAutogen/MocSkipSource/qItemA.hpp
diff --git a/Tests/QtAutogen/skipSource/qItemB.cpp b/Tests/QtAutogen/MocSkipSource/qItemB.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemB.cpp
rename to Tests/QtAutogen/MocSkipSource/qItemB.cpp
diff --git a/Tests/QtAutogen/skipSource/qItemB.hpp b/Tests/QtAutogen/MocSkipSource/qItemB.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemB.hpp
rename to Tests/QtAutogen/MocSkipSource/qItemB.hpp
diff --git a/Tests/QtAutogen/skipSource/qItemC.cpp b/Tests/QtAutogen/MocSkipSource/qItemC.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemC.cpp
rename to Tests/QtAutogen/MocSkipSource/qItemC.cpp
diff --git a/Tests/QtAutogen/skipSource/qItemC.hpp b/Tests/QtAutogen/MocSkipSource/qItemC.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemC.hpp
rename to Tests/QtAutogen/MocSkipSource/qItemC.hpp
diff --git a/Tests/QtAutogen/skipSource/qItemD.cpp b/Tests/QtAutogen/MocSkipSource/qItemD.cpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemD.cpp
rename to Tests/QtAutogen/MocSkipSource/qItemD.cpp
diff --git a/Tests/QtAutogen/skipSource/qItemD.hpp b/Tests/QtAutogen/MocSkipSource/qItemD.hpp
similarity index 100%
rename from Tests/QtAutogen/skipSource/qItemD.hpp
rename to Tests/QtAutogen/MocSkipSource/qItemD.hpp
diff --git a/Tests/QtAutogen/skipMoc.cpp b/Tests/QtAutogen/MocSkipSource/skipMoc.cpp
similarity index 53%
rename from Tests/QtAutogen/skipMoc.cpp
rename to Tests/QtAutogen/MocSkipSource/skipMoc.cpp
index d6b292f..c915334 100644
--- a/Tests/QtAutogen/skipMoc.cpp
+++ b/Tests/QtAutogen/MocSkipSource/skipMoc.cpp
@@ -1,8 +1,8 @@
 
-#include "skipSource/qItemA.hpp"
-#include "skipSource/qItemB.hpp"
-#include "skipSource/qItemC.hpp"
-#include "skipSource/qItemD.hpp"
+#include "qItemA.hpp"
+#include "qItemB.hpp"
+#include "qItemC.hpp"
+#include "qItemD.hpp"
 
 int main(int, char**)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f658bdaa7c7899a46caf402d4114999019897d46
commit f658bdaa7c7899a46caf402d4114999019897d46
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 18:03:20 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate RccOffMocLibrary test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 9125bd7..723747a 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,22 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Add not_generated_file.qrc to the source list to get the file-level
-# dependency, but don't generate a c++ file from it.  Disable the AUTORCC
-# feature for this target.  This tests that qrc files in the sources don't
-# have an effect on generation if AUTORCC is off.
-add_library(empty STATIC empty.cpp not_generated_file.qrc)
-set_target_properties(empty PROPERTIES AUTORCC OFF)
-set_target_properties(empty PROPERTIES AUTOMOC TRUE)
-target_link_libraries(empty no_link_language)
-add_library(no_link_language STATIC empty.h)
-set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE)
-# Pass Qt compiler features to targets that don't link against Qt
-target_compile_features(no_link_language PRIVATE ${QT_COMPILE_FEATURES})
-target_compile_features(empty PRIVATE ${QT_COMPILE_FEATURES})
-
-
-# -- Test
 # Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target
 if(ALLOW_WRAP_CPP)
   # Generate header mocs manually
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 0950062..f998b74 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -6,3 +6,4 @@ if(QT_TEST_ALLOW_QT_MACROS)
 endif()
 ADD_AUTOGEN_TEST(RccOnly rccOnly)
 ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
+ADD_AUTOGEN_TEST(RccOffMocLibrary)
diff --git a/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt b/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt
new file mode 100644
index 0000000..7f7432e
--- /dev/null
+++ b/Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.10)
+project(RccOffMocLibrary)
+include("../AutogenTest.cmake")
+
+# Add not_generated_file.qrc to the source list to get the file-level
+# dependency, but don't generate a c++ file from it.  Disable the AUTORCC
+# feature for this target.  This tests that qrc files in the sources don't
+# have an effect on generation if AUTORCC is off.
+add_library(empty STATIC empty.cpp not_generated_file.qrc)
+set_target_properties(empty PROPERTIES AUTORCC OFF)
+set_target_properties(empty PROPERTIES AUTOMOC TRUE)
+target_link_libraries(empty no_link_language)
+add_library(no_link_language STATIC empty.h)
+set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE)
+# Pass Qt compiler features to targets that don't link against Qt
+target_compile_features(no_link_language PRIVATE ${QT_COMPILE_FEATURES})
+target_compile_features(empty PRIVATE ${QT_COMPILE_FEATURES})
diff --git a/Tests/QtAutogen/empty.cpp b/Tests/QtAutogen/RccOffMocLibrary/empty.cpp
similarity index 100%
rename from Tests/QtAutogen/empty.cpp
rename to Tests/QtAutogen/RccOffMocLibrary/empty.cpp
diff --git a/Tests/QtAutogen/empty.h b/Tests/QtAutogen/RccOffMocLibrary/empty.h
similarity index 100%
rename from Tests/QtAutogen/empty.h
rename to Tests/QtAutogen/RccOffMocLibrary/empty.h
diff --git a/Tests/QtAutogen/not_generated_file.qrc b/Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc
similarity index 100%
rename from Tests/QtAutogen/not_generated_file.qrc
rename to Tests/QtAutogen/RccOffMocLibrary/not_generated_file.qrc

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f00e6c7c7024a784d2da310ba7b5f4a67e60fdff
commit f00e6c7c7024a784d2da310ba7b5f4a67e60fdff
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 17:46:58 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:28 2017 +0100

    Autogen: Tests: Separate RccOnly and RccEmpty tests

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 85029d1..9125bd7 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,18 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# RCC only
-add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc)
-set_property(TARGET rccOnly PROPERTY AUTORCC ON)
-target_link_libraries(rccOnly ${QT_QTCORE_TARGET})
-
-# -- Test
-# RCC empty
-add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc)
-set_property(TARGET rccEmpty PROPERTY AUTORCC ON)
-target_link_libraries(rccEmpty ${QT_QTCORE_TARGET})
-
-# -- Test
 # Add not_generated_file.qrc to the source list to get the file-level
 # dependency, but don't generate a c++ file from it.  Disable the AUTORCC
 # feature for this target.  This tests that qrc files in the sources don't
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 9121f41..0950062 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -4,3 +4,5 @@ ADD_AUTOGEN_TEST(MocOptions mocOptions)
 if(QT_TEST_ALLOW_QT_MACROS)
   ADD_AUTOGEN_TEST(UicOnly uicOnly)
 endif()
+ADD_AUTOGEN_TEST(RccOnly rccOnly)
+ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
diff --git a/Tests/QtAutogen/RccEmpty/CMakeLists.txt b/Tests/QtAutogen/RccEmpty/CMakeLists.txt
new file mode 100644
index 0000000..3b16edc
--- /dev/null
+++ b/Tests/QtAutogen/RccEmpty/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.10)
+project(RccEmpty)
+include("../AutogenTest.cmake")
+
+# Test AUTORCC on a .qrc file with no resource files
+add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc)
+set_property(TARGET rccEmpty PROPERTY AUTORCC ON)
+target_link_libraries(rccEmpty ${QT_QTCORE_TARGET})
diff --git a/Tests/QtAutogen/rccEmpty.cpp b/Tests/QtAutogen/RccEmpty/rccEmpty.cpp
similarity index 100%
rename from Tests/QtAutogen/rccEmpty.cpp
rename to Tests/QtAutogen/RccEmpty/rccEmpty.cpp
diff --git a/Tests/QtAutogen/rccEmptyRes.qrc b/Tests/QtAutogen/RccEmpty/rccEmptyRes.qrc
similarity index 100%
rename from Tests/QtAutogen/rccEmptyRes.qrc
rename to Tests/QtAutogen/RccEmpty/rccEmptyRes.qrc
diff --git a/Tests/QtAutogen/RccOnly/CMakeLists.txt b/Tests/QtAutogen/RccOnly/CMakeLists.txt
new file mode 100644
index 0000000..a65dee4
--- /dev/null
+++ b/Tests/QtAutogen/RccOnly/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.10)
+project(RccOnly)
+include("../AutogenTest.cmake")
+
+# Test AUTORCC being enabled only
+add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc)
+set_property(TARGET rccOnly PROPERTY AUTORCC ON)
+target_link_libraries(rccOnly ${QT_QTCORE_TARGET})
diff --git a/Tests/QtAutogen/rccOnly.cpp b/Tests/QtAutogen/RccOnly/rccOnly.cpp
similarity index 100%
rename from Tests/QtAutogen/rccOnly.cpp
rename to Tests/QtAutogen/RccOnly/rccOnly.cpp
diff --git a/Tests/QtAutogen/rccOnlyRes.qrc b/Tests/QtAutogen/RccOnly/rccOnlyRes.qrc
similarity index 100%
rename from Tests/QtAutogen/rccOnlyRes.qrc
rename to Tests/QtAutogen/RccOnly/rccOnlyRes.qrc

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9
commit 6273b8354902e1af124d6f9b4a0ba23cf5e8a9b9
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 17:38:13 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:27 2017 +0100

    Autogen: Tests: Separate uicOnly test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 160903a..85029d1 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,15 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# UIC only
-if(ALLOW_WRAP_CPP)
-  qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h)
-  add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc})
-  set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
-  target_link_libraries(uicOnly ${QT_LIBRARIES})
-endif()
-
-# -- Test
 # RCC only
 add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc)
 set_property(TARGET rccOnly PROPERTY AUTORCC ON)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 5abbee5..9121f41 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -1,3 +1,6 @@
 # Autogen tests common for Qt4 and Qt5
 ADD_AUTOGEN_TEST(MocOnly mocOnly)
 ADD_AUTOGEN_TEST(MocOptions mocOptions)
+if(QT_TEST_ALLOW_QT_MACROS)
+  ADD_AUTOGEN_TEST(UicOnly uicOnly)
+endif()
diff --git a/Tests/QtAutogen/UicOnly/CMakeLists.txt b/Tests/QtAutogen/UicOnly/CMakeLists.txt
new file mode 100644
index 0000000..89a9a1b
--- /dev/null
+++ b/Tests/QtAutogen/UicOnly/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.10)
+project(UicOnly)
+include("../AutogenTest.cmake")
+
+# Test AUTOUIC being enabled only
+# The moc is provided by the Qt macro
+qtx_wrap_cpp(uicOnlyMoc uiconly.h)
+add_executable(uicOnly uiconly.cpp ${uicOnlyMoc})
+set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
+target_link_libraries(uicOnly ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.cpp b/Tests/QtAutogen/UicOnly/uiconly.cpp
similarity index 100%
rename from Tests/QtAutogen/uicOnlySource/uiconly.cpp
rename to Tests/QtAutogen/UicOnly/uiconly.cpp
diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.h b/Tests/QtAutogen/UicOnly/uiconly.h
similarity index 100%
rename from Tests/QtAutogen/uicOnlySource/uiconly.h
rename to Tests/QtAutogen/UicOnly/uiconly.h
diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.ui b/Tests/QtAutogen/UicOnly/uiconly.ui
similarity index 100%
rename from Tests/QtAutogen/uicOnlySource/uiconly.ui
rename to Tests/QtAutogen/UicOnly/uiconly.ui

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b8597a86ee8bed2c34f52d309fd57b5f29a1595
commit 0b8597a86ee8bed2c34f52d309fd57b5f29a1595
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 17:29:23 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:27 2017 +0100

    Autogen: Tests: Separate mocOnly and mocOnlyOpts tests

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index dff9d0c..160903a 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,17 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# MOC only
-add_executable(mocOnly mocOnlySource/main.cpp mocOnlySource/StyleA.cpp mocOnlySource/StyleB.cpp)
-set_property(TARGET mocOnly PROPERTY AUTOMOC ON)
-target_link_libraries(mocOnly ${QT_LIBRARIES})
-
-add_executable(mocOnlyOpts mocOnlySource/main.cpp mocOnlySource/StyleA.cpp mocOnlySource/StyleB.cpp)
-set_property(TARGET mocOnlyOpts PROPERTY AUTOMOC ON)
-set_property(TARGET mocOnlyOpts PROPERTY AUTOMOC_MOC_OPTIONS "-nw")
-target_link_libraries(mocOnlyOpts ${QT_LIBRARIES})
-
-# -- Test
 # UIC only
 if(ALLOW_WRAP_CPP)
   qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 0eaf831..5abbee5 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -1 +1,3 @@
 # Autogen tests common for Qt4 and Qt5
+ADD_AUTOGEN_TEST(MocOnly mocOnly)
+ADD_AUTOGEN_TEST(MocOptions mocOptions)
diff --git a/Tests/QtAutogen/MocOnly/CMakeLists.txt b/Tests/QtAutogen/MocOnly/CMakeLists.txt
new file mode 100644
index 0000000..33feadf
--- /dev/null
+++ b/Tests/QtAutogen/MocOnly/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocOnly)
+include("../AutogenTest.cmake")
+
+# Test different Q_OBJECT position styles
+add_executable(mocOnly StyleA.cpp StyleB.cpp main.cpp)
+set_property(TARGET mocOnly PROPERTY AUTOMOC ON)
+target_link_libraries(mocOnly ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/mocOnlySource/StyleA.cpp b/Tests/QtAutogen/MocOnly/StyleA.cpp
similarity index 100%
rename from Tests/QtAutogen/mocOnlySource/StyleA.cpp
rename to Tests/QtAutogen/MocOnly/StyleA.cpp
diff --git a/Tests/QtAutogen/mocOnlySource/StyleA.hpp b/Tests/QtAutogen/MocOnly/StyleA.hpp
similarity index 79%
rename from Tests/QtAutogen/mocOnlySource/StyleA.hpp
rename to Tests/QtAutogen/MocOnly/StyleA.hpp
index 66735b6..5ba0a87 100644
--- a/Tests/QtAutogen/mocOnlySource/StyleA.hpp
+++ b/Tests/QtAutogen/MocOnly/StyleA.hpp
@@ -3,6 +3,7 @@
 
 #include <QObject>
 
+/* clang-format off */
 /// Q_OBJECT on a single new line
 ///
 class StyleA : public QObject
@@ -11,5 +12,6 @@ class StyleA : public QObject
 public:
   StyleA();
 };
+/* clang-format on */
 
 #endif
diff --git a/Tests/QtAutogen/mocOnlySource/StyleB.cpp b/Tests/QtAutogen/MocOnly/StyleB.cpp
similarity index 100%
rename from Tests/QtAutogen/mocOnlySource/StyleB.cpp
rename to Tests/QtAutogen/MocOnly/StyleB.cpp
diff --git a/Tests/QtAutogen/mocOnlySource/StyleB.hpp b/Tests/QtAutogen/MocOnly/StyleB.hpp
similarity index 81%
rename from Tests/QtAutogen/mocOnlySource/StyleB.hpp
rename to Tests/QtAutogen/MocOnly/StyleB.hpp
index 425daf8..86abaa8 100644
--- a/Tests/QtAutogen/mocOnlySource/StyleB.hpp
+++ b/Tests/QtAutogen/MocOnly/StyleB.hpp
@@ -4,7 +4,7 @@
 #include <QObject>
 
 /* clang-format off */
-/// Q_OBJECT behind a brace
+/// Q_OBJECT behind a brace on a new line
 ///
 class StyleB : public QObject
 { Q_OBJECT
diff --git a/Tests/QtAutogen/mocOnlySource/main.cpp b/Tests/QtAutogen/MocOnly/main.cpp
similarity index 100%
rename from Tests/QtAutogen/mocOnlySource/main.cpp
rename to Tests/QtAutogen/MocOnly/main.cpp
diff --git a/Tests/QtAutogen/MocOptions/CMakeLists.txt b/Tests/QtAutogen/MocOptions/CMakeLists.txt
new file mode 100644
index 0000000..f64b37b
--- /dev/null
+++ b/Tests/QtAutogen/MocOptions/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.10)
+project(MocOptions)
+include("../AutogenTest.cmake")
+
+# Test extra options passed to moc via AUTOMOC_MOC_OPTIONS
+add_executable(mocOptions Object.cpp main.cpp)
+set_property(TARGET mocOptions PROPERTY AUTOMOC ON)
+set_property(TARGET mocOptions PROPERTY AUTOMOC_MOC_OPTIONS "-nw")
+target_link_libraries(mocOptions ${QT_LIBRARIES})
diff --git a/Tests/QtAutogen/MocOptions/Object.cpp b/Tests/QtAutogen/MocOptions/Object.cpp
new file mode 100644
index 0000000..ad109f1
--- /dev/null
+++ b/Tests/QtAutogen/MocOptions/Object.cpp
@@ -0,0 +1,5 @@
+#include "Object.hpp"
+
+Object::Object()
+{
+}
diff --git a/Tests/QtAutogen/MocOptions/Object.hpp b/Tests/QtAutogen/MocOptions/Object.hpp
new file mode 100644
index 0000000..e7a6142
--- /dev/null
+++ b/Tests/QtAutogen/MocOptions/Object.hpp
@@ -0,0 +1,13 @@
+#ifndef Object_HPP
+#define Object_HPP
+
+#include <QObject>
+
+class Object : public QObject
+{
+  Q_OBJECT
+public:
+  Object();
+};
+
+#endif
diff --git a/Tests/QtAutogen/MocOptions/main.cpp b/Tests/QtAutogen/MocOptions/main.cpp
new file mode 100644
index 0000000..7aeab1a
--- /dev/null
+++ b/Tests/QtAutogen/MocOptions/main.cpp
@@ -0,0 +1,7 @@
+#include "Object.hpp"
+
+int main(int argv, char** args)
+{
+  Object object;
+  return 0;
+}
diff --git a/Tests/QtAutogen/TestMacros.cmake b/Tests/QtAutogen/TestMacros.cmake
index 849a733..966f3b8 100644
--- a/Tests/QtAutogen/TestMacros.cmake
+++ b/Tests/QtAutogen/TestMacros.cmake
@@ -41,9 +41,8 @@ macro(ADD_AUTOGEN_TEST NAME)
   unset(_BuildDir)
 endmacro()
 
-
 # Allow using qtx_wrap_cpp and qtx_generate_moc or not
-set(ALLOW_WRAP_CPP TRUE)
+set(QT_TEST_ALLOW_QT_MACROS TRUE)
 # Do a simple check if there is are non ASCII character in the build path
 string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR})
 if(NON_ASCII_BDIR)
@@ -51,11 +50,11 @@ if(NON_ASCII_BDIR)
   # qtx_wrap_cpp
   # https://bugreports.qt.io/browse/QTBUG-35480
   if(QT_TEST_VERSION STREQUAL 4)
-    set(ALLOW_WRAP_CPP FALSE)
+    set(QT_TEST_ALLOW_QT_MACROS FALSE)
   endif()
   # On windows qtx_wrap_cpp also fails in Qt5 when used on a path that
   # contains non ASCII characters
   if(WIN32)
-    set(ALLOW_WRAP_CPP FALSE)
+    set(QT_TEST_ALLOW_QT_MACROS FALSE)
   endif()
 endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=227a7974f426e0966d1736c66dd606b068985d1b
commit 227a7974f426e0966d1736c66dd606b068985d1b
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Dec 8 17:09:30 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Wed Dec 13 13:48:27 2017 +0100

    Autogen: Tests: Add basic scripts for separate tests

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1d13f1c..5608933 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1263,6 +1263,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     find_package(Qt5Widgets QUIET NO_MODULE)
   endif()
   if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
+    add_subdirectory(Qt5Autogen)
+
     add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutogen"
@@ -1309,6 +1311,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5AutoUicInterface")
   endif()
   if(QT4_WORKS AND QT_QTGUI_FOUND)
+    add_subdirectory(Qt4Autogen)
+
     add_test(NAME Qt4Autogen COMMAND ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/QtAutogen"
diff --git a/Tests/Qt4Autogen/CMakeLists.txt b/Tests/Qt4Autogen/CMakeLists.txt
new file mode 100644
index 0000000..818e888
--- /dev/null
+++ b/Tests/Qt4Autogen/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Set Qt test version and include the Autogen test macros
+set(QT_TEST_VERSION 4)
+include("../QtAutogen/TestMacros.cmake")
+
+# Qt4 only tests
+ADD_AUTOGEN_TEST(DefinesTest)
+
+# Common tests
+include("../QtAutogen/CommonTests.cmake")
diff --git a/Tests/Qt5Autogen/CMakeLists.txt b/Tests/Qt5Autogen/CMakeLists.txt
new file mode 100644
index 0000000..527e5ff
--- /dev/null
+++ b/Tests/Qt5Autogen/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Set Qt test version and include the Autogen test macros
+set(QT_TEST_VERSION 5)
+include("../QtAutogen/TestMacros.cmake")
+
+# Common tests
+include("../QtAutogen/CommonTests.cmake")
diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cmake
new file mode 100644
index 0000000..8c0a14f
--- /dev/null
+++ b/Tests/QtAutogen/AutogenTest.cmake
@@ -0,0 +1,53 @@
+
+# Tell find_package(Qt5) where to find Qt.
+if(QT_QMAKE_EXECUTABLE)
+  get_filename_component(Qt_BIN_DIR "${QT_QMAKE_EXECUTABLE}" PATH)
+  get_filename_component(Qt_PREFIX_DIR "${Qt_BIN_DIR}" PATH)
+  list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
+endif()
+
+if (QT_TEST_VERSION STREQUAL 4)
+  find_package(Qt4 REQUIRED)
+  include(UseQt4)
+
+  set(QT_QTCORE_TARGET Qt4::QtCore)
+  set(QT_QTGUI_TARGET Qt4::QtGui)
+
+  # Qt macros
+  macro(qtx_wrap_cpp)
+    qt4_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qtx_generate_moc)
+    qt4_generate_moc(${ARGN})
+  endmacro()
+
+elseif(QT_TEST_VERSION STREQUAL 5)
+  find_package(Qt5Widgets REQUIRED)
+
+  set(QT_QTCORE_TARGET Qt5::Core)
+  set(QT_QTGUI_TARGET Qt5::Widgets)
+
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
+  set(QT_LIBRARIES Qt5::Widgets)
+
+  if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
+    add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
+  endif()
+
+  # Qt macros
+  macro(qtx_wrap_cpp)
+    qt5_wrap_cpp(${ARGN})
+  endmacro()
+  macro(qtx_generate_moc)
+    qt5_generate_moc(${ARGN})
+  endmacro()
+
+else()
+  message(SEND_ERROR "Invalid Qt version specified: ${QT_TEST_VERSION}")
+endif()
+
+# Get Qt compile features
+get_property(QT_COMPILE_FEATURES
+  TARGET ${QT_QTCORE_TARGET}
+  PROPERTY INTERFACE_COMPILE_FEATURES
+)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
new file mode 100644
index 0000000..0eaf831
--- /dev/null
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -0,0 +1 @@
+# Autogen tests common for Qt4 and Qt5
diff --git a/Tests/QtAutogen/DefinesTest/CMakeLists.txt b/Tests/QtAutogen/DefinesTest/CMakeLists.txt
new file mode 100644
index 0000000..de22845
--- /dev/null
+++ b/Tests/QtAutogen/DefinesTest/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.10)
+project(DefinesTest)
+
+# Qt4 only definitions test
+if(NOT QT_TEST_VERSION STREQUAL 4)
+  message(ERROR "Invalid Qt test version. This test is for Qt4 only.")
+endif()
+
+find_package(Qt4 REQUIRED)
+
+add_executable(DefinesTest defines_test.cpp)
+set_target_properties(DefinesTest PROPERTIES AUTOMOC TRUE)
+target_link_libraries(DefinesTest Qt4::QtGui)
diff --git a/Tests/QtAutogen/DefinesTest/defines_test.cpp b/Tests/QtAutogen/DefinesTest/defines_test.cpp
new file mode 100644
index 0000000..cf4e9cb
--- /dev/null
+++ b/Tests/QtAutogen/DefinesTest/defines_test.cpp
@@ -0,0 +1,38 @@
+
+#include <QObject>
+
+#ifdef QT_GUI_LIB
+#include <QTextDocument>
+
+class SomeDocument : public QTextDocument
+{
+  Q_OBJECT
+
+Q_SIGNALS:
+  void someSig();
+};
+#endif
+
+#ifdef QT_CORE_LIB
+class SomeObject : public QObject
+{
+  Q_OBJECT
+
+Q_SIGNALS:
+  void someSig();
+};
+#endif
+
+int main(int argc, char** argv)
+{
+#ifdef QT_CORE_LIB
+  QMetaObject sosmo = SomeObject::staticMetaObject;
+#endif
+#ifdef QT_GUI_LIB
+  QMetaObject sdsmo = SomeDocument::staticMetaObject;
+#endif
+
+  return 0;
+}
+
+#include "defines_test.moc"
diff --git a/Tests/QtAutogen/TestMacros.cmake b/Tests/QtAutogen/TestMacros.cmake
new file mode 100644
index 0000000..849a733
--- /dev/null
+++ b/Tests/QtAutogen/TestMacros.cmake
@@ -0,0 +1,61 @@
+# Autogen build options
+set(Autogen_BUILD_OPTIONS "-DQT_TEST_VERSION=${QT_TEST_VERSION}")
+if(NOT CMAKE_CONFIGURATION_TYPES)
+  list(APPEND Autogen_BUILD_OPTIONS "-DCMAKE_BUILD_TYPE=$<CONFIGURATION>")
+endif()
+list(APPEND Autogen_BUILD_OPTIONS
+    "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
+)
+
+# A macro to add a QtAutogen test
+macro(ADD_AUTOGEN_TEST NAME)
+  if(${ARGC} GREATER 1)
+    # On Windows there is no RPATH, so while Qt might be available for building,
+    # the required dlls may not be in the PATH, so we can't run the executables
+    # on that platform.
+    if(WIN32)
+      set(_TestCommand --test-command ${CMAKE_CTEST_COMMAND} -V)
+    else()
+      set(_TestCommand --test-command ${ARGN})
+    endif()
+  endif()
+
+  set(_QtXAutogen "Qt${QT_TEST_VERSION}Autogen")
+  set(_SourceDir "${CMake_SOURCE_DIR}/Tests/QtAutogen/${NAME}")
+  set(_BuildDir "${CMake_BINARY_DIR}/Tests/${_QtXAutogen}/${NAME}")
+  add_test(NAME "${_QtXAutogen}.${NAME}" COMMAND "${CMAKE_CTEST_COMMAND}"
+    --build-and-test
+    "${_SourceDir}"
+    "${_BuildDir}"
+    ${build_generator_args}
+    --build-project ${NAME}
+    --build-exe-dir "${_BuildDir}"
+    --force-new-ctest-process
+    --build-options ${build_options} ${Autogen_BUILD_OPTIONS}
+    ${_TestCommand}
+  )
+  list(APPEND TEST_BUILD_DIRS "${_BuildDir}")
+  unset(_TestCommand)
+  unset(_QtXAutogen)
+  unset(_SourceDir)
+  unset(_BuildDir)
+endmacro()
+
+
+# Allow using qtx_wrap_cpp and qtx_generate_moc or not
+set(ALLOW_WRAP_CPP TRUE)
+# Do a simple check if there is are non ASCII character in the build path
+string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR})
+if(NON_ASCII_BDIR)
+  # Qt4 moc does not support utf8 paths in _parameter files generated by
+  # qtx_wrap_cpp
+  # https://bugreports.qt.io/browse/QTBUG-35480
+  if(QT_TEST_VERSION STREQUAL 4)
+    set(ALLOW_WRAP_CPP FALSE)
+  endif()
+  # On windows qtx_wrap_cpp also fails in Qt5 when used on a path that
+  # contains non ASCII characters
+  if(WIN32)
+    set(ALLOW_WRAP_CPP FALSE)
+  endif()
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d1ed84ceaa1c3467c091de302c778b5989bd03c
commit 7d1ed84ceaa1c3467c091de302c778b5989bd03c
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Tue Dec 12 14:43:08 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Tue Dec 12 14:43:08 2017 +0100

    IRSL: Skip libgfxoffload if no Intel C++ is used
    
    `libgfxoffload` is only used and installed by the Intel C/C++ compilers
    and will be unavailable if only Intel Fortran has been installed.
    
    Fixes: #17550

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 38e0861..c886aef 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -600,11 +600,14 @@ if(_IRSL_HAVE_Intel)
     if(_Intel_compiler_ver VERSION_LESS 18)
       list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c")
     endif()
-    foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libgfxoffload.dll libioffload_host.dll libirngmd.dll
+    foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libioffload_host.dll libirngmd.dll
       libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)
 
       list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
     endforeach()
+    if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
+      list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.dll")
+    endif()
     if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
       foreach(__Intel_lib IN ITEMS ifdlg100.dll libicaf.dll libifcoremd.dll libifcoremdd.dll libifcorert.dll libifcorertd.dll libifportmd.dll)
 
@@ -637,10 +640,10 @@ if(_IRSL_HAVE_Intel)
       endforeach()
     endif()
     if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
-      foreach(__Intel_lib IN ITEMS libgfxoffload.so libistrconv.so)
-
-        list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
-      endforeach()
+      list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so")
+      if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
+        list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.so")
+      endif()
     endif()
     if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16)
       foreach(__Intel_lib IN ITEMS libioffload_host.so libioffload_host.so.5 libioffload_target.so libioffload_target.so.5 libmpx.so offload_main)

-----------------------------------------------------------------------

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake       |   13 +-
 Source/cmExtraSublimeTextGenerator.cxx             |   20 +-
 Source/cmGeneratorExpression.cxx                   |   16 ++
 Source/cmGeneratorExpression.h                     |   47 +++-
 Source/cmGlobalXCodeGenerator.cxx                  |   29 ++-
 Source/cmLocalVisualStudio7Generator.cxx           |   37 ++--
 Source/cmMakefileTargetGenerator.cxx               |   18 +-
 Source/cmNinjaTargetGenerator.cxx                  |   21 +-
 Source/cmServerProtocol.cxx                        |   19 +-
 Source/cmVisualStudio10TargetGenerator.cxx         |    8 +-
 Tests/CMakeLists.txt                               |  105 +--------
 Tests/GeneratorExpression/CMakeLists.txt           |    8 +
 .../srcgenex_defs_COMPILE_LANGUAGE.c               |   12 +
 .../srcgenex_flags_COMPILE_LANGUAGE.c              |   12 +
 Tests/Qt4Autogen/CMakeLists.txt                    |    9 +
 Tests/Qt5Autogen/CMakeLists.txt                    |    6 +
 Tests/QtAutogen/AutogenTest.cmake                  |   53 +++++
 Tests/QtAutogen/CMakeLists.txt                     |  233 --------------------
 Tests/QtAutogen/CommonTests.cmake                  |   40 ++++
 .../{complex => Complex}/Adir/CMakeLists.txt       |    0
 Tests/QtAutogen/{complex => Complex}/Adir/libA.cpp |    0
 Tests/QtAutogen/{complex => Complex}/Adir/libA.h   |    0
 .../{complex => Complex}/Bdir/CMakeLists.txt       |    0
 Tests/QtAutogen/{complex => Complex}/Bdir/libB.cpp |    0
 Tests/QtAutogen/{complex => Complex}/Bdir/libB.h   |    0
 .../QtAutogen/{complex => Complex}/CMakeLists.txt  |    6 +-
 Tests/QtAutogen/{complex => Complex}/abc.cpp       |    0
 Tests/QtAutogen/{complex => Complex}/abc.h         |    0
 Tests/QtAutogen/{complex => Complex}/abc_p.h       |    0
 Tests/QtAutogen/{complex => Complex}/bar.cpp       |    0
 Tests/QtAutogen/{complex => Complex}/blub.cpp      |    0
 Tests/QtAutogen/{complex => Complex}/blub.h        |    0
 Tests/QtAutogen/{complex => Complex}/calwidget.cpp |    0
 Tests/QtAutogen/{complex => Complex}/calwidget.h   |    0
 Tests/QtAutogen/{complex => Complex}/calwidget.ui  |    0
 .../QtAutogen/{complex => Complex}/codeeditor.cpp  |    0
 Tests/QtAutogen/{complex => Complex}/codeeditor.h  |    0
 .../QtAutogen/{complex => Complex}/debug_class.cpp |    0
 Tests/QtAutogen/{complex => Complex}/debug_class.h |    0
 .../QtAutogen/{complex => Complex}/debug_class.ui  |    0
 .../{complex => Complex}/debug_resource.qrc        |    0
 Tests/QtAutogen/{complex => Complex}/foo.cpp       |    0
 Tests/QtAutogen/{complex => Complex}/foo.h         |    0
 Tests/QtAutogen/{complex => Complex}/gadget.cpp    |    0
 Tests/QtAutogen/{complex => Complex}/gadget.h      |    0
 Tests/QtAutogen/{complex => Complex}/generated.cpp |    0
 Tests/QtAutogen/{complex => Complex}/generated.h   |    0
 .../{complex => Complex}/generated.txt.in          |    0
 .../{complex => Complex}/generated_resource.qrc.in |    0
 Tests/QtAutogen/{complex => Complex}/libC.cpp      |    0
 Tests/QtAutogen/{complex => Complex}/libC.h        |    0
 Tests/QtAutogen/{complex => Complex}/main.cpp      |    0
 .../{complex => Complex}/multiplewidgets.cpp       |    0
 .../{complex => Complex}/multiplewidgets.h         |    0
 .../{complex => Complex}/myinterface.h.in          |    0
 .../{complex => Complex}/myotherinterface.h.in     |    0
 .../{complex => Complex}/private_slot.cpp          |    0
 .../QtAutogen/{complex => Complex}/private_slot.h  |    0
 .../{complex => Complex}/resourcetester.cpp        |    0
 .../{complex => Complex}/resourcetester.h          |    0
 .../{complex => Complex}/second_resource.qrc       |    0
 .../{complex => Complex}/second_widget.cpp         |    0
 .../QtAutogen/{complex => Complex}/second_widget.h |    0
 .../{complex => Complex}/second_widget.ui          |    0
 Tests/QtAutogen/{complex => Complex}/sub/bar.h     |    0
 .../{complex => Complex}/targetObjectsTest.cpp     |    0
 Tests/QtAutogen/{complex => Complex}/test.qrc      |    0
 Tests/QtAutogen/{complex => Complex}/widget1.ui    |    0
 Tests/QtAutogen/{complex => Complex}/widget2.ui    |    0
 Tests/QtAutogen/{complex => Complex}/xyz.cpp       |    0
 Tests/QtAutogen/{complex => Complex}/xyz.h         |    0
 Tests/QtAutogen/{complex => Complex}/yaf.cpp       |    0
 Tests/QtAutogen/{complex => Complex}/yaf.h         |    0
 Tests/QtAutogen/{complex => Complex}/yaf_p.h       |    0
 Tests/QtAutogen/DefinesTest/CMakeLists.txt         |   13 ++
 .../{defines_test => DefinesTest}/defines_test.cpp |    0
 .../QtAutogen/{macosFW => MacOsFW}/CMakeLists.txt  |    5 +-
 .../{macosFW => MacOsFW}/src/CMakeLists.txt        |    0
 .../{macosFW => MacOsFW}/src/macos_fw_lib.cpp      |    0
 .../{macosFW => MacOsFW}/src/macos_fw_lib.h        |    0
 .../{macosFW => MacOsFW}/test/CMakeLists.txt       |    0
 .../{macosFW => MacOsFW}/test/testMacosFWLib.cpp   |    0
 .../{macosFW => MacOsFW}/test/testMacosFWLib.h     |    0
 Tests/QtAutogen/MocCMP0071/CMakeLists.txt          |    6 +
 .../{mocCMP0071 => MocCMP0071}/NEW/CMakeLists.txt  |    2 +-
 .../{mocCMP0071 => MocCMP0071}/OLD/CMakeLists.txt  |    2 +-
 Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj.cpp |    0
 Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj.hpp |    0
 Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj_p.h |    0
 .../QtAutogen/{mocCMP0071 => MocCMP0071}/main.cpp  |    0
 .../{mocDepends => MocDepends}/CMakeLists.txt      |   30 +--
 .../object_invalid.hpp.in                          |    0
 .../{mocDepends => MocDepends}/object_valid.hpp.in |    0
 .../{mocDepends => MocDepends}/simpleLib.cpp.in    |    0
 .../{mocDepends => MocDepends}/simpleLib.hpp.in    |    0
 .../{mocDepends => MocDepends}/testATDFile.cpp     |    0
 .../{mocDepends => MocDepends}/testATDTarget.cpp   |    0
 .../{mocDepends => MocDepends}/testGenFile.cpp     |    0
 .../{mocDepends => MocDepends}/testGenLib.cpp      |    0
 .../{mocDepends => MocDepends}/testGenLib.hpp      |    0
 .../{mocDepends => MocDepends}/testGenTarget.cpp   |    0
 .../QtAutogen/{mocInclude => MocInclude}/EObjA.cpp |    1 +
 .../QtAutogen/{mocInclude => MocInclude}/EObjA.hpp |    0
 .../{mocInclude => MocInclude}/EObjAExtra.cpp      |    0
 .../{mocInclude => MocInclude}/EObjAExtra.hpp      |    0
 .../{mocInclude => MocInclude}/EObjAExtra_p.hpp    |    0
 .../{mocInclude => MocInclude}/EObjA_p.hpp         |    0
 .../QtAutogen/{mocInclude => MocInclude}/EObjB.cpp |    1 +
 .../QtAutogen/{mocInclude => MocInclude}/EObjB.hpp |    0
 .../{mocInclude => MocInclude}/EObjB_p.hpp         |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjA.cpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjA.hpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjA_p.h |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjB.cpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjB.hpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/LObjB_p.h |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjA.cpp  |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjA.hpp  |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjA_p.h  |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjB.cpp  |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjB.hpp  |    0
 .../QtAutogen/{mocInclude => MocInclude}/ObjB_p.h  |    0
 .../QtAutogen/{mocInclude => MocInclude}/SObjA.cpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/SObjA.hpp |    0
 .../{mocInclude => MocInclude}/SObjB.cpp.in        |    0
 .../{mocInclude => MocInclude}/SObjB.hpp.in        |    0
 .../QtAutogen/{mocInclude => MocInclude}/SObjC.cpp |    0
 .../QtAutogen/{mocInclude => MocInclude}/SObjC.hpp |    0
 .../{mocInclude => MocInclude}/SObjCExtra.cpp      |    0
 .../{mocInclude => MocInclude}/SObjCExtra.hpp      |    0
 .../{mocInclude => MocInclude}/SObjCExtra.moc.in   |    0
 .../{mocInclude => MocInclude}/shared.cmake        |   42 ++--
 .../subExtra/EObjBExtra.cpp                        |    0
 .../subExtra/EObjBExtra.hpp                        |    0
 .../subExtra/EObjBExtra_p.hpp                      |    0
 .../{mocInclude => MocInclude}/subGlobal/GObj.cpp  |    0
 .../{mocInclude => MocInclude}/subGlobal/GObj.hpp  |    0
 .../subGlobal/GObj_p.hpp                           |    0
 .../CMakeLists.txt                                 |    7 +-
 .../RMain.cpp                                      |    0
 .../RObjA.cpp                                      |    0
 .../RObjA.hpp                                      |    0
 .../RObjB.cpp                                      |    0
 .../RObjB.hpp                                      |    0
 .../RObjBExtra.hpp                                 |    0
 .../RObjC.cpp                                      |    0
 .../RObjC.hpp                                      |    0
 .../main.cpp                                       |    0
 Tests/QtAutogen/MocIncludeStrict/CMakeLists.txt    |   10 +
 .../main.cpp                                       |    0
 Tests/QtAutogen/MocMacroName/CMakeLists.txt        |   17 ++
 .../CustomMacros.hpp                               |    0
 .../{mocMacroName => MocMacroName}/Gadget.cpp      |    2 +-
 .../{mocMacroName => MocMacroName}/Gadget.hpp      |    8 +-
 .../{mocMacroName => MocMacroName}/Object.cpp      |    1 +
 .../{mocMacroName => MocMacroName}/Object.hpp      |    7 +-
 .../Object1Aliased.cpp                             |    0
 .../Object1Aliased.hpp                             |    0
 .../Object2Aliased.cpp                             |    0
 .../Object2Aliased.hpp                             |    0
 .../{mocMacroName => MocMacroName}/main.cpp        |    0
 Tests/QtAutogen/MocOnly/CMakeLists.txt             |    8 +
 .../{mocOnlySource => MocOnly}/StyleA.cpp          |    0
 .../{mocOnlySource => MocOnly}/StyleA.hpp          |    2 +
 .../{mocOnlySource => MocOnly}/StyleB.cpp          |    0
 .../{mocOnlySource => MocOnly}/StyleB.hpp          |    2 +-
 .../QtAutogen/{mocOnlySource => MocOnly}/main.cpp  |    0
 Tests/QtAutogen/MocOptions/CMakeLists.txt          |    9 +
 .../{mocMacroName => MocOptions}/Object.cpp        |    4 -
 .../object_valid.hpp.in => MocOptions/Object.hpp}  |    7 +-
 .../mocPlugin => QtAutogen/MocOptions}/main.cpp    |    3 +-
 Tests/QtAutogen/MocSkipSource/CMakeLists.txt       |   36 +++
 .../{skipSource => MocSkipSource}/qItemA.cpp       |    0
 .../{skipSource => MocSkipSource}/qItemA.hpp       |    0
 .../{skipSource => MocSkipSource}/qItemB.cpp       |    0
 .../{skipSource => MocSkipSource}/qItemB.hpp       |    0
 .../{skipSource => MocSkipSource}/qItemC.cpp       |    0
 .../{skipSource => MocSkipSource}/qItemC.hpp       |    0
 .../{skipSource => MocSkipSource}/qItemD.cpp       |    0
 .../{skipSource => MocSkipSource}/qItemD.hpp       |    0
 Tests/QtAutogen/{ => MocSkipSource}/skipMoc.cpp    |    8 +-
 .../CMakeLists.txt                                 |    4 +
 .../a/CMakeLists.txt                               |    0
 .../{objectLibrary => ObjectLibrary}/a/classa.cpp  |    0
 .../{objectLibrary => ObjectLibrary}/a/classa.h    |    0
 .../{objectLibrary => ObjectLibrary}/b/classb.cpp  |    0
 .../{objectLibrary => ObjectLibrary}/b/classb.h    |    0
 .../{objectLibrary => ObjectLibrary}/main.cpp      |    0
 Tests/QtAutogen/RccEmpty/CMakeLists.txt            |    8 +
 Tests/QtAutogen/{ => RccEmpty}/rccEmpty.cpp        |    0
 Tests/QtAutogen/{ => RccEmpty}/rccEmptyRes.qrc     |    0
 Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt    |   17 ++
 Tests/QtAutogen/{ => RccOffMocLibrary}/empty.cpp   |    0
 Tests/QtAutogen/{ => RccOffMocLibrary}/empty.h     |    0
 .../{ => RccOffMocLibrary}/not_generated_file.qrc  |    0
 Tests/QtAutogen/RccOnly/CMakeLists.txt             |    8 +
 Tests/QtAutogen/{ => RccOnly}/rccOnly.cpp          |    0
 Tests/QtAutogen/{ => RccOnly}/rccOnlyRes.qrc       |    0
 Tests/QtAutogen/RccSkipSource/CMakeLists.txt       |   23 ++
 Tests/QtAutogen/{ => RccSkipSource}/skipRcc.cpp    |    0
 .../{skipSource => RccSkipSource}/skipRccBad1.qrc  |    0
 .../{skipSource => RccSkipSource}/skipRccBad2.qrc  |    0
 .../{skipSource => RccSkipSource}/skipRccGood.qrc  |    0
 Tests/QtAutogen/RerunMocBasic/CMakeLists.txt       |   65 ++++++
 .../RerunMocBasic/MocBasic/CMakeLists.txt          |   24 ++
 .../RerunMocBasic/MocBasic}/input.txt              |    0
 .../RerunMocBasic/MocBasic}/main.cpp.in            |    5 +
 .../RerunMocBasic/MocBasic}/res1.qrc               |    0
 .../RerunMocBasic/MocBasic}/test1a.h.in            |    0
 .../RerunMocBasic/MocBasic}/test1b.h.in            |    0
 .../RerunMocBasic}/dummy.cpp                       |    0
 .../RerunMocPlugin/CMakeLists.txt}                 |   17 +-
 .../RerunMocPlugin/MocPlugin}/CMakeLists.txt       |   20 +-
 .../RerunMocPlugin/MocPlugin}/StyleA.cpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleA.hpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleA.json          |    0
 .../RerunMocPlugin/MocPlugin}/StyleA_Custom.json   |    0
 .../RerunMocPlugin/MocPlugin}/StyleB.cpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleB.hpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleC.cpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleC.hpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleD.cpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleD.hpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleE.cpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleE.hpp           |    0
 .../RerunMocPlugin/MocPlugin}/StyleEInclude.hpp    |    0
 .../RerunMocPlugin/MocPlugin}/UtilityMacros.hpp    |    0
 .../RerunMocPlugin/MocPlugin}/jsonIn/StyleB.json   |    0
 .../MocPlugin}/jsonIn/StyleB_Custom.json           |    0
 .../RerunMocPlugin/MocPlugin}/jsonIn/StyleC.json   |    0
 .../RerunMocPlugin/MocPlugin}/jsonIn/StyleD.json   |    0
 .../RerunMocPlugin/MocPlugin}/jsonIn/StyleE.json   |    0
 .../RerunMocPlugin/MocPlugin}/main.cpp             |    0
 .../RerunMocPlugin}/dummy.cpp                      |    0
 .../RerunRccDepends/CMakeLists.txt}                |   20 +-
 .../RerunRccDepends/RccDepends}/CMakeLists.txt     |   32 +--
 .../RerunRccDepends/RccDepends}/main.cpp           |    0
 .../RccDepends}/resGen/input.txt.in                |    0
 .../RccDepends}/resGen/inputAdded.txt.in           |    0
 .../RerunRccDepends/RccDepends}/resGenA.qrc.in     |    0
 .../RerunRccDepends/RccDepends}/resGenB.qrc.in     |    0
 .../RccDepends}/resPlain/input.txt.in              |    0
 .../RccDepends}/resPlain/inputAdded.txt.in         |    0
 .../RerunRccDepends/RccDepends}/resPlainA.qrc.in   |    0
 .../RerunRccDepends/RccDepends}/resPlainB.qrc.in   |    0
 .../RerunRccDepends}/dummy.cpp                     |    0
 .../{sameName => SameName}/CMakeLists.txt          |    7 +-
 .../{sameName => SameName}/aaa/bbb/data.qrc        |    0
 .../{sameName => SameName}/aaa/bbb/item.cpp        |    0
 .../{sameName => SameName}/aaa/bbb/item.hpp        |    0
 .../QtAutogen/{sameName => SameName}/aaa/data.qrc  |    0
 .../QtAutogen/{sameName => SameName}/aaa/item.cpp  |    0
 .../QtAutogen/{sameName => SameName}/aaa/item.hpp  |    0
 Tests/QtAutogen/{sameName => SameName}/aaa/view.ui |    0
 .../{sameName => SameName}/bbb/aaa/data.qrc        |    0
 .../{sameName => SameName}/bbb/aaa/item.cpp        |    0
 .../{sameName => SameName}/bbb/aaa/item.hpp        |    0
 .../QtAutogen/{sameName => SameName}/bbb/data.qrc  |    0
 .../QtAutogen/{sameName => SameName}/bbb/item.cpp  |    0
 .../QtAutogen/{sameName => SameName}/bbb/item.hpp  |    0
 Tests/QtAutogen/{sameName => SameName}/bbb/view.ui |    0
 .../QtAutogen/{sameName => SameName}/ccc/data.qrc  |    0
 .../QtAutogen/{sameName => SameName}/ccc/item.cpp  |    0
 .../QtAutogen/{sameName => SameName}/ccc/item.hpp  |    0
 Tests/QtAutogen/{sameName => SameName}/ccc/view.ui |    0
 Tests/QtAutogen/{sameName => SameName}/data.qrc    |    0
 Tests/QtAutogen/{sameName => SameName}/item.cpp    |    0
 Tests/QtAutogen/{sameName => SameName}/item.hpp    |    0
 Tests/QtAutogen/{sameName => SameName}/main.cpp    |    0
 Tests/QtAutogen/{sameName => SameName}/view.ui     |    0
 .../CMakeLists.txt                                 |    7 +-
 Tests/QtAutogen/StaticLibraryCycle/a.cpp           |   12 +
 .../{staticLibraryCycle => StaticLibraryCycle}/a.h |    2 +
 .../b.cpp                                          |    0
 .../{staticLibraryCycle => StaticLibraryCycle}/b.h |    0
 .../c.cpp                                          |    0
 .../{staticLibraryCycle => StaticLibraryCycle}/c.h |    0
 .../main.cpp                                       |    0
 Tests/QtAutogen/TestMacros.cmake                   |   60 +++++
 .../{uicInclude => UicInclude}/CMakeLists.txt      |    5 +-
 .../QtAutogen/{uicInclude => UicInclude}/PageC.ui  |    0
 .../QtAutogen/{uicInclude => UicInclude}/PageC2.ui |    0
 .../{uicInclude => UicInclude}/dirA/PageA.ui       |    0
 .../{uicInclude => UicInclude}/dirB/PageB.ui       |    0
 .../{uicInclude => UicInclude}/dirB/PageB2.ui      |    0
 .../dirB/subB/PageBsub.ui                          |    0
 .../QtAutogen/{uicInclude => UicInclude}/main.cpp  |    0
 .../QtAutogen/{uicInclude => UicInclude}/main.hpp  |    0
 .../{uicInclude => UicInclude}/subC/PageCsub.ui    |    0
 .../UicInterface}/CMakeLists.txt                   |   30 +--
 .../UicInterface}/klocalizedstring.cpp             |    0
 .../UicInterface}/klocalizedstring.h               |    0
 .../UicInterface}/libwidget.cpp                    |    0
 .../UicInterface}/libwidget.h                      |    0
 .../UicInterface}/libwidget.ui                     |    0
 .../UicInterface}/main.cpp                         |    0
 .../UicInterface}/mywidget.cpp                     |    0
 .../UicInterface}/mywidget.h                       |    0
 .../UicInterface}/mywidget.ui                      |    0
 Tests/QtAutogen/UicOnly/CMakeLists.txt             |   10 +
 .../{uicOnlySource => UicOnly}/uiconly.cpp         |    0
 .../QtAutogen/{uicOnlySource => UicOnly}/uiconly.h |    0
 .../{uicOnlySource => UicOnly}/uiconly.ui          |    0
 Tests/QtAutogen/UicSkipSource/CMakeLists.txt       |   22 ++
 Tests/QtAutogen/{ => UicSkipSource}/skipUic.cpp    |    6 +-
 .../{skipSource => UicSkipSource}/skipUicGen.cpp   |    0
 .../{skipSource => UicSkipSource}/skipUicGen.hpp   |    0
 .../skipUicNoGen1.cpp                              |    0
 .../skipUicNoGen1.hpp                              |    0
 .../skipUicNoGen2.cpp                              |    0
 .../skipUicNoGen2.hpp                              |    0
 .../{skipSource => UicSkipSource}/ui_nogen1.h      |    0
 .../{skipSource => UicSkipSource}/ui_nogen2.h      |    2 +-
 .../{skipSource => UicSkipSource}/uigen1.ui        |    0
 .../{skipSource => UicSkipSource}/uigen2.ui        |    0
 Tests/QtAutogen/defines_test/CMakeLists.txt        |    4 -
 Tests/QtAutogen/mocCMP0071/CMakeLists.txt          |    4 -
 Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt    |    6 -
 Tests/QtAutogen/mocMacroName/CMakeLists.txt        |    8 -
 Tests/QtAutogen/staticLibraryCycle/a.cpp           |    7 -
 Tests/QtAutogenRerun/CMakeLists.txt                |   52 -----
 Tests/QtAutogenRerun/defines_test/CMakeLists.txt   |    4 -
 Tests/QtAutogenRerun/defines_test/defines_test.cpp |   38 ----
 Tests/QtAutogenRerun/mocRerun.cmake                |   60 -----
 Tests/QtAutogenRerun/mocRerun/CMakeLists.txt       |   33 ---
 .../PerSourceCompileDefinitions-result.txt}        |    0
 .../PerSourceCompileDefinitions-stderr-VS.txt      |    7 +
 .../PerSourceCompileDefinitions-stderr-Xcode.txt   |    7 +
 .../PerSourceCompileDefinitions.cmake              |    5 +
 .../COMPILE_LANGUAGE-genex/RunCMakeTest.cmake      |    7 +
 330 files changed, 829 insertions(+), 764 deletions(-)
 create mode 100644 Tests/GeneratorExpression/srcgenex_defs_COMPILE_LANGUAGE.c
 create mode 100644 Tests/GeneratorExpression/srcgenex_flags_COMPILE_LANGUAGE.c
 create mode 100644 Tests/Qt4Autogen/CMakeLists.txt
 create mode 100644 Tests/Qt5Autogen/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/AutogenTest.cmake
 delete mode 100644 Tests/QtAutogen/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/CommonTests.cmake
 rename Tests/QtAutogen/{complex => Complex}/Adir/CMakeLists.txt (100%)
 rename Tests/QtAutogen/{complex => Complex}/Adir/libA.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/Adir/libA.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/Bdir/CMakeLists.txt (100%)
 rename Tests/QtAutogen/{complex => Complex}/Bdir/libB.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/Bdir/libB.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/CMakeLists.txt (97%)
 rename Tests/QtAutogen/{complex => Complex}/abc.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/abc.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/abc_p.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/bar.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/blub.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/blub.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/calwidget.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/calwidget.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/calwidget.ui (100%)
 rename Tests/QtAutogen/{complex => Complex}/codeeditor.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/codeeditor.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/debug_class.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/debug_class.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/debug_class.ui (100%)
 rename Tests/QtAutogen/{complex => Complex}/debug_resource.qrc (100%)
 rename Tests/QtAutogen/{complex => Complex}/foo.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/foo.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/gadget.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/gadget.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/generated.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/generated.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/generated.txt.in (100%)
 rename Tests/QtAutogen/{complex => Complex}/generated_resource.qrc.in (100%)
 rename Tests/QtAutogen/{complex => Complex}/libC.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/libC.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/main.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/multiplewidgets.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/multiplewidgets.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/myinterface.h.in (100%)
 rename Tests/QtAutogen/{complex => Complex}/myotherinterface.h.in (100%)
 rename Tests/QtAutogen/{complex => Complex}/private_slot.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/private_slot.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/resourcetester.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/resourcetester.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/second_resource.qrc (100%)
 rename Tests/QtAutogen/{complex => Complex}/second_widget.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/second_widget.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/second_widget.ui (100%)
 rename Tests/QtAutogen/{complex => Complex}/sub/bar.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/targetObjectsTest.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/test.qrc (100%)
 rename Tests/QtAutogen/{complex => Complex}/widget1.ui (100%)
 rename Tests/QtAutogen/{complex => Complex}/widget2.ui (100%)
 rename Tests/QtAutogen/{complex => Complex}/xyz.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/xyz.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/yaf.cpp (100%)
 rename Tests/QtAutogen/{complex => Complex}/yaf.h (100%)
 rename Tests/QtAutogen/{complex => Complex}/yaf_p.h (100%)
 create mode 100644 Tests/QtAutogen/DefinesTest/CMakeLists.txt
 rename Tests/QtAutogen/{defines_test => DefinesTest}/defines_test.cpp (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/CMakeLists.txt (85%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/src/CMakeLists.txt (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/src/macos_fw_lib.cpp (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/src/macos_fw_lib.h (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/test/CMakeLists.txt (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/test/testMacosFWLib.cpp (100%)
 rename Tests/QtAutogen/{macosFW => MacOsFW}/test/testMacosFWLib.h (100%)
 create mode 100644 Tests/QtAutogen/MocCMP0071/CMakeLists.txt
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/NEW/CMakeLists.txt (94%)
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/OLD/CMakeLists.txt (95%)
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj.cpp (100%)
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj.hpp (100%)
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/Obj_p.h (100%)
 rename Tests/QtAutogen/{mocCMP0071 => MocCMP0071}/main.cpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/CMakeLists.txt (89%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/object_invalid.hpp.in (100%)
 copy Tests/QtAutogen/{mocDepends => MocDepends}/object_valid.hpp.in (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/simpleLib.cpp.in (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/simpleLib.hpp.in (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testATDFile.cpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testATDTarget.cpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testGenFile.cpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testGenLib.cpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testGenLib.hpp (100%)
 rename Tests/QtAutogen/{mocDepends => MocDepends}/testGenTarget.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjA.cpp (97%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjA.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjAExtra.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjAExtra.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjAExtra_p.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjA_p.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjB.cpp (97%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjB.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/EObjB_p.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjA.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjA.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjA_p.h (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjB.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjB.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/LObjB_p.h (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjA.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjA.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjA_p.h (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjB.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjB.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/ObjB_p.h (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjA.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjA.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjB.cpp.in (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjB.hpp.in (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjC.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjC.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjCExtra.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjCExtra.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/SObjCExtra.moc.in (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/shared.cmake (67%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subExtra/EObjBExtra.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subExtra/EObjBExtra.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subExtra/EObjBExtra_p.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subGlobal/GObj.cpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subGlobal/GObj.hpp (100%)
 rename Tests/QtAutogen/{mocInclude => MocInclude}/subGlobal/GObj_p.hpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/CMakeLists.txt (69%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RMain.cpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjA.cpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjA.hpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjB.cpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjB.hpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjBExtra.hpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjC.cpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/RObjC.hpp (100%)
 rename Tests/QtAutogen/{mocIncludeRelaxed => MocIncludeRelaxed}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/MocIncludeStrict/CMakeLists.txt
 rename Tests/QtAutogen/{mocIncludeStrict => MocIncludeStrict}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/MocMacroName/CMakeLists.txt
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/CustomMacros.hpp (100%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Gadget.cpp (77%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Gadget.hpp (55%)
 copy Tests/QtAutogen/{mocMacroName => MocMacroName}/Object.cpp (84%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object.hpp (63%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object1Aliased.cpp (100%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object1Aliased.hpp (100%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object2Aliased.cpp (100%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/Object2Aliased.hpp (100%)
 rename Tests/QtAutogen/{mocMacroName => MocMacroName}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/MocOnly/CMakeLists.txt
 rename Tests/QtAutogen/{mocOnlySource => MocOnly}/StyleA.cpp (100%)
 rename Tests/QtAutogen/{mocOnlySource => MocOnly}/StyleA.hpp (79%)
 rename Tests/QtAutogen/{mocOnlySource => MocOnly}/StyleB.cpp (100%)
 rename Tests/QtAutogen/{mocOnlySource => MocOnly}/StyleB.hpp (81%)
 rename Tests/QtAutogen/{mocOnlySource => MocOnly}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/MocOptions/CMakeLists.txt
 rename Tests/QtAutogen/{mocMacroName => MocOptions}/Object.cpp (62%)
 rename Tests/QtAutogen/{mocDepends/object_valid.hpp.in => MocOptions/Object.hpp} (56%)
 copy Tests/{QtAutogenRerun/mocPlugin => QtAutogen/MocOptions}/main.cpp (55%)
 create mode 100644 Tests/QtAutogen/MocSkipSource/CMakeLists.txt
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemA.cpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemA.hpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemB.cpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemB.hpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemC.cpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemC.hpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemD.cpp (100%)
 rename Tests/QtAutogen/{skipSource => MocSkipSource}/qItemD.hpp (100%)
 rename Tests/QtAutogen/{ => MocSkipSource}/skipMoc.cpp (53%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/CMakeLists.txt (83%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/a/CMakeLists.txt (100%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/a/classa.cpp (100%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/a/classa.h (100%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/b/classb.cpp (100%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/b/classb.h (100%)
 rename Tests/QtAutogen/{objectLibrary => ObjectLibrary}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/RccEmpty/CMakeLists.txt
 rename Tests/QtAutogen/{ => RccEmpty}/rccEmpty.cpp (100%)
 rename Tests/QtAutogen/{ => RccEmpty}/rccEmptyRes.qrc (100%)
 create mode 100644 Tests/QtAutogen/RccOffMocLibrary/CMakeLists.txt
 rename Tests/QtAutogen/{ => RccOffMocLibrary}/empty.cpp (100%)
 rename Tests/QtAutogen/{ => RccOffMocLibrary}/empty.h (100%)
 rename Tests/QtAutogen/{ => RccOffMocLibrary}/not_generated_file.qrc (100%)
 create mode 100644 Tests/QtAutogen/RccOnly/CMakeLists.txt
 rename Tests/QtAutogen/{ => RccOnly}/rccOnly.cpp (100%)
 rename Tests/QtAutogen/{ => RccOnly}/rccOnlyRes.qrc (100%)
 create mode 100644 Tests/QtAutogen/RccSkipSource/CMakeLists.txt
 rename Tests/QtAutogen/{ => RccSkipSource}/skipRcc.cpp (100%)
 rename Tests/QtAutogen/{skipSource => RccSkipSource}/skipRccBad1.qrc (100%)
 rename Tests/QtAutogen/{skipSource => RccSkipSource}/skipRccBad2.qrc (100%)
 rename Tests/QtAutogen/{skipSource => RccSkipSource}/skipRccGood.qrc (100%)
 create mode 100644 Tests/QtAutogen/RerunMocBasic/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/RerunMocBasic/MocBasic/CMakeLists.txt
 rename Tests/{QtAutogenRerun/mocRerun => QtAutogen/RerunMocBasic/MocBasic}/input.txt (100%)
 rename Tests/{QtAutogenRerun/mocRerun => QtAutogen/RerunMocBasic/MocBasic}/main.cpp.in (58%)
 rename Tests/{QtAutogenRerun/mocRerun => QtAutogen/RerunMocBasic/MocBasic}/res1.qrc (100%)
 rename Tests/{QtAutogenRerun/mocRerun => QtAutogen/RerunMocBasic/MocBasic}/test1a.h.in (100%)
 rename Tests/{QtAutogenRerun/mocRerun => QtAutogen/RerunMocBasic/MocBasic}/test1b.h.in (100%)
 copy Tests/{QtAutogenRerun => QtAutogen/RerunMocBasic}/dummy.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin.cmake => QtAutogen/RerunMocPlugin/CMakeLists.txt} (89%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/CMakeLists.txt (78%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleA.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleA.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleA.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleA_Custom.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleB.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleB.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleC.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleC.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleD.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleD.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleE.cpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleE.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/StyleEInclude.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/UtilityMacros.hpp (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/jsonIn/StyleB.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/jsonIn/StyleB_Custom.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/jsonIn/StyleC.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/jsonIn/StyleD.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/jsonIn/StyleE.json (100%)
 rename Tests/{QtAutogenRerun/mocPlugin => QtAutogen/RerunMocPlugin/MocPlugin}/main.cpp (100%)
 copy Tests/{QtAutogenRerun => QtAutogen/RerunMocPlugin}/dummy.cpp (100%)
 rename Tests/{QtAutogenRerun/rccDepends.cmake => QtAutogen/RerunRccDepends/CMakeLists.txt} (92%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/CMakeLists.txt (64%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/main.cpp (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resGen/input.txt.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resGen/inputAdded.txt.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resGenA.qrc.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resGenB.qrc.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resPlain/input.txt.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resPlain/inputAdded.txt.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resPlainA.qrc.in (100%)
 rename Tests/{QtAutogenRerun/rccDepends => QtAutogen/RerunRccDepends/RccDepends}/resPlainB.qrc.in (100%)
 rename Tests/{QtAutogenRerun => QtAutogen/RerunRccDepends}/dummy.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/CMakeLists.txt (89%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/bbb/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/bbb/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/bbb/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/aaa/view.ui (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/aaa/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/aaa/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/aaa/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/bbb/view.ui (100%)
 rename Tests/QtAutogen/{sameName => SameName}/ccc/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/ccc/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/ccc/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/ccc/view.ui (100%)
 rename Tests/QtAutogen/{sameName => SameName}/data.qrc (100%)
 rename Tests/QtAutogen/{sameName => SameName}/item.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/item.hpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/main.cpp (100%)
 rename Tests/QtAutogen/{sameName => SameName}/view.ui (100%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/CMakeLists.txt (73%)
 create mode 100644 Tests/QtAutogen/StaticLibraryCycle/a.cpp
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/a.h (83%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/b.cpp (100%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/b.h (100%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/c.cpp (100%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/c.h (100%)
 rename Tests/QtAutogen/{staticLibraryCycle => StaticLibraryCycle}/main.cpp (100%)
 create mode 100644 Tests/QtAutogen/TestMacros.cmake
 rename Tests/QtAutogen/{uicInclude => UicInclude}/CMakeLists.txt (68%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/PageC.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/PageC2.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/dirA/PageA.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/dirB/PageB.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/dirB/PageB2.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/dirB/subB/PageBsub.ui (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/main.cpp (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/main.hpp (100%)
 rename Tests/QtAutogen/{uicInclude => UicInclude}/subC/PageCsub.ui (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/CMakeLists.txt (71%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/klocalizedstring.cpp (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/klocalizedstring.h (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/libwidget.cpp (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/libwidget.h (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/libwidget.ui (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/main.cpp (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/mywidget.cpp (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/mywidget.h (100%)
 rename Tests/{QtAutoUicInterface => QtAutogen/UicInterface}/mywidget.ui (100%)
 create mode 100644 Tests/QtAutogen/UicOnly/CMakeLists.txt
 rename Tests/QtAutogen/{uicOnlySource => UicOnly}/uiconly.cpp (100%)
 rename Tests/QtAutogen/{uicOnlySource => UicOnly}/uiconly.h (100%)
 rename Tests/QtAutogen/{uicOnlySource => UicOnly}/uiconly.ui (100%)
 create mode 100644 Tests/QtAutogen/UicSkipSource/CMakeLists.txt
 rename Tests/QtAutogen/{ => UicSkipSource}/skipUic.cpp (57%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicGen.cpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicGen.hpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicNoGen1.cpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicNoGen1.hpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicNoGen2.cpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/skipUicNoGen2.hpp (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/ui_nogen1.h (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/ui_nogen2.h (89%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/uigen1.ui (100%)
 rename Tests/QtAutogen/{skipSource => UicSkipSource}/uigen2.ui (100%)
 delete mode 100644 Tests/QtAutogen/defines_test/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/mocCMP0071/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/mocIncludeStrict/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/mocMacroName/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/staticLibraryCycle/a.cpp
 delete mode 100644 Tests/QtAutogenRerun/CMakeLists.txt
 delete mode 100644 Tests/QtAutogenRerun/defines_test/CMakeLists.txt
 delete mode 100644 Tests/QtAutogenRerun/defines_test/defines_test.cpp
 delete mode 100644 Tests/QtAutogenRerun/mocRerun.cmake
 delete mode 100644 Tests/QtAutogenRerun/mocRerun/CMakeLists.txt
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-result.txt} (100%)
 create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-VS.txt
 create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions-stderr-Xcode.txt
 create mode 100644 Tests/RunCMake/COMPILE_LANGUAGE-genex/PerSourceCompileDefinitions.cmake


hooks/post-receive
-- 
CMake